mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
Vladislav Vaintroub 2009-12-20 11:25:27 +01:00
commit ea35ac81ee
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/my_atomic.h
View file

@ -68,11 +68,12 @@
#include "atomic/nolock.h"
#endif
#ifndef MY_ATOMICS_MADE
#ifndef make_atomic_cas_body
#ifndef MY_ATOMIC_NOLOCK
/* nolock.h was not able to generate even a CAS function, fall back */
#include "atomic/rwlock.h"
#else
#endif
#ifndef MY_ATOMICS_MADE
/* define missing functions by using the already generated ones */
#ifndef make_atomic_add_body
#define make_atomic_add_body(S) \
@ -95,7 +96,6 @@
#define make_atomic_store_body(S) \
(void)(my_atomic_fas ## S (a, v));
#endif
#endif
/*
transparent_union doesn't work in g++
@ -287,7 +287,7 @@ make_atomic_store(ptr)
#undef make_atomic_load_body
#undef make_atomic_store_body
#undef make_atomic_fas_body
#endif /* MY_ATOMICS_MADE */
#endif
#undef intptr
/*