merge

9ceecebd · Vladislav Vaintroub · 6135e431 · 24c0b613 · 9ceecebd
Commit 9ceecebd authored Dec 05, 2009 by Vladislav Vaintroub
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

include/my_atomic.h include/my_atomic.h +2 -0

No files found.
--- a/include/my_atomic.h
+++ b/include/my_atomic.h
@@ -69,6 +69,7 @@
 #include "atomic/nolock.h"
 #endif

+#ifndef MY_ATOMICS_MADE
 #ifndef make_atomic_cas_body
 /* nolock.h was not able to generate even a CAS function, fall back */
 #include "atomic/rwlock.h"
@@ -277,6 +278,7 @@ make_atomic_store(ptr)
 #undef make_atomic_load_body
 #undef make_atomic_store_body
 #undef make_atomic_fas_body
+#endif /* MY_ATOMICS_MADE */
 #undef intptr

 /*