developer: only do the C++ reserved name checking on Linux

[kai/samba-autobuild/.git] / source4 / include / includes.h

diff --git a/source4/include/includes.h b/source4/include/includes.h
index 4862a62e22c4ca9d93bfe25b91e9f486e102b034..d0a97020c6e470de2ebe05bd28b10635ebd621b4 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -32,12 +32,13 @@
 
 #include "system/time.h"
 #include "system/wait.h"
+#include "system/locale.h"
 
 /* only do the C++ reserved word check when we compile
    to include --with-developer since too many systems
    still have comflicts with their header files (e.g. IRIX 6.4) */
 
-#if !defined(__cplusplus) && defined(DEVELOPER)
+#if !defined(__cplusplus) && defined(DEVELOPER) && defined(__linux__)
 #define class #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
 #define private #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
 #define public #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
@@ -68,9 +69,4 @@
 #include "../lib/util/smb_threads.h"
 #include "../lib/util/smb_threads_internal.h"
 
-#if 0
-/* darn, we can't do this now that we don't link the ldb tools to all the smb libs */
-#define TALLOC_ABORT(reason) smb_panic(reason)
-#endif
-
 #endif /* _INCLUDES_H */