diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-20 12:48:09 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-20 12:48:09 +0300 |
| commit | 2c145a94ffa902ef2330b94a7dabc965091e9f53 (patch) | |
| tree | fcfd1b9cbb7c97015bff88d3b87d9c7581332440 | |
| parent | a5a2835c0641d67c98a2f69a94f511584a235c0a (diff) | |
| parent | d4f23f0cf6db38731a161c5c7b0b056fc67e5c02 (diff) | |
| download | mariadb-git-2c145a94ffa902ef2330b94a7dabc965091e9f53.tar.gz | |
Auto-merge from mysql-next-mr.
| -rw-r--r-- | include/my_atomic.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/my_atomic.h b/include/my_atomic.h index 23c3dc749ab..751afcb77db 100644 --- a/include/my_atomic.h +++ b/include/my_atomic.h @@ -68,10 +68,12 @@ #include "atomic/nolock.h" #endif -#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) \ @@ -94,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++ @@ -286,6 +287,7 @@ make_atomic_store(ptr) #undef make_atomic_load_body #undef make_atomic_store_body #undef make_atomic_fas_body +#endif #undef intptr /* |