summaryrefslogtreecommitdiff
path: root/include/my_atomic.h
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mysql.com>2009-12-23 09:27:41 +0100
committerSergei Golubchik <serg@mysql.com>2009-12-23 09:27:41 +0100
commit3bfb8797d017f8f9f13aecd82f6c08ad6619c5bb (patch)
treecc1e69d8e934db280c8ce65f725dfee80f201a84 /include/my_atomic.h
parent274e1e4497744e402017f9753de0f3c8354e45e8 (diff)
downloadmariadb-git-3bfb8797d017f8f9f13aecd82f6c08ad6619c5bb.tar.gz
fix atomic/solaris.h to conform
remove duplicated boilerplate code
Diffstat (limited to 'include/my_atomic.h')
-rw-r--r--include/my_atomic.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/my_atomic.h b/include/my_atomic.h
index 751afcb77db..b506aa7d3d1 100644
--- a/include/my_atomic.h
+++ b/include/my_atomic.h
@@ -68,12 +68,11 @@
#include "atomic/nolock.h"
#endif
-#ifndef MY_ATOMIC_NOLOCK
+#ifndef make_atomic_cas_body
/* nolock.h was not able to generate even a CAS function, fall back */
#include "atomic/rwlock.h"
#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) \
@@ -287,7 +286,6 @@ make_atomic_store(ptr)
#undef make_atomic_load_body
#undef make_atomic_store_body
#undef make_atomic_fas_body
-#endif
#undef intptr
/*