1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Auto-merge from mysql-next-mr.

Browse Source
This commit is contained in:
Alexander Nozdrin 2009-12-20 12:48:09 +03:00
commit 2c145a94ff
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/my_atomic.h
View File

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