Makefile: define __CEPH__ in ceph builds. use it.

Avoid breakage when headers are used outside of ceph build (librados-dev)

diff --git a/src/Makefile.am b/src/Makefile.am
index b0fe648db849835971bc5e54ae485acb5ecc2440..10157b7970720a8b95c7f3a0e8a3c6c431bd2659 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -247,8 +247,8 @@ INCLUDES =
 LDADD =
 
 
-AM_CXXFLAGS = -Wall -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_THREAD_SAFE -rdynamic
-AM_CFLAGS = -Wall -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_THREAD_SAFE -rdynamic
+AM_CXXFLAGS = -Wall -D__CEPH__ -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_THREAD_SAFE -rdynamic
+AM_CFLAGS = -Wall -D__CEPH__ -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_THREAD_SAFE -rdynamic
 AM_LDFLAGS =
 
 if WITH_LIBATOMIC

diff --git a/src/include/atomic.h b/src/include/atomic.h
index c84877db90a31102d1fcc75326b3fd8894c2ed14..4d2c456ec0463d28bdaeaa29dff69299f27ee32d 100644 (file)
--- a/src/include/atomic.h
+++ b/src/include/atomic.h
@@ -15,7 +15,7 @@
 #ifndef __CEPH_ATOMIC_H
 #define __CEPH_ATOMIC_H
 
-#ifdef HAVE_CONFIG_H
+#ifdef __CEPH__
 # include "acconfig.h"
 #endif
 

diff --git a/src/include/buffer.h b/src/include/buffer.h
index 5aeb0a44c327f61474b12259d1bfbd073dbaafaf..a5ed2e3e579c4c49021ac0af7aca5c3cef5579b5 100644 (file)
--- a/src/include/buffer.h
+++ b/src/include/buffer.h
@@ -59,7 +59,7 @@ using std::string;
 #include "page.h"
 #include "crc32c.h"
 
-#ifndef assert
+#ifndef __CEPH__
 # include <assert.h>
 #endif