summaryrefslogtreecommitdiff
path: root/include/my_atomic.h
diff options
context:
space:
mode:
authorMikael Ronstrom <mikael@mysql.com>2009-12-19 12:48:39 +0100
committerMikael Ronstrom <mikael@mysql.com>2009-12-19 12:48:39 +0100
commita99300e264a0db66520329e972de902109dafe19 (patch)
treef0bf35783825eaad7cf5f94f4a6221f18eb2f69a /include/my_atomic.h
parent3b103b4897cb62fffbdaaec066e27be5c957531e (diff)
downloadmariadb-git-a99300e264a0db66520329e972de902109dafe19.tar.gz
Fixed solaris builds
Diffstat (limited to 'include/my_atomic.h')
-rw-r--r--include/my_atomic.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/my_atomic.h b/include/my_atomic.h
index 23c3dc749ab..fbeacb66e1d 100644
--- a/include/my_atomic.h
+++ b/include/my_atomic.h
@@ -69,8 +69,16 @@
#endif
#ifndef make_atomic_cas_body
+/*
+ When implementing atomics using solaris.h we will end up here.
+ In this case we have already implemented all atomic functions
+ and no more work is needed, this is indicated by MY_ATOMICS_MADE
+ being defined but not make_atomic_cas_body.
+*/
+#ifndef MY_ATOMICS_MADE
/* nolock.h was not able to generate even a CAS function, fall back */
#include "atomic/rwlock.h"
+#endif
#else
/* define missing functions by using the already generated ones */
#ifndef make_atomic_add_body