assert: work around libatomic_ops vs assert in a less lame way

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/include/assert.h b/src/include/assert.h
index f3f60f57bab0227d94feee5798f82413bae0b8e9..88bdc41cc6891f1afb8e0c3a4b0aa368eaea3298 100644 (file)
--- a/src/include/assert.h
+++ b/src/include/assert.h
@@ -7,16 +7,6 @@
 # include "acconfig.h"
 #endif
 
-/*
- * atomic_ops.h includes the system assert.h, which will redefine
- * 'assert' even if it's already been included.  so, make sure we
- * include atomic_ops.h first so that we don't get an #include
- * <assert.h> again later.
- */
-#ifndef NO_ATOMIC_OPS
-# include "atomic_ops.h"
-#endif
-
 struct CephContext;
 
 #ifdef __cplusplus

diff --git a/src/include/atomic.h b/src/include/atomic.h
index 5d4a9a31277167a8d9e7eafca374ac00a73491e9..f2e56f9134bb43f4be47be6741a0f7345056bffb 100644 (file)
--- a/src/include/atomic.h
+++ b/src/include/atomic.h
@@ -21,9 +21,13 @@
 #endif
 
 #ifndef NO_ATOMIC_OPS
-//libatomic_ops implementation
+
+// libatomic_ops implementation
 #include <atomic_ops.h>
 
+// reinclude our assert to clobber the system one
+#include "include/assert.h"
+
 namespace ceph {
   class atomic_t {
     AO_t val;