]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
libatomic: fix assert.h compilation
authorYehuda Sadeh <yehuda@hq.newdream.net>
Thu, 3 Jun 2010 23:44:31 +0000 (16:44 -0700)
committerYehuda Sadeh <yehuda@hq.newdream.net>
Thu, 3 Jun 2010 23:45:06 +0000 (16:45 -0700)
src/include/assert.h

index 82bcd23427aab6de717c1ff14f01d5b5888ceca0..32459109c7a42e8b6f39dc77dff4696ced505e6d 100644 (file)
@@ -3,13 +3,17 @@
 
 #include <features.h>
 
+#include "acconfig.h"
+
 /*
  * 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
 
 #ifdef __cplusplus