s4:includes: copy #error DONT_USE_CPLUSPLUS_RESERVED_NAMES from source3

[jra/samba/.git] / source4 / include / includes.h

diff --git a/source4/include/includes.h b/source4/include/includes.h
index 7b623120a92e681fd084ad15a90207cf96aa7ce4..d9b7759e7e9ee47807ce498b15706e69affc5d12 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -30,20 +30,34 @@
 #endif
 #endif /* NO_CONFIG_H */
 
-#include "local.h"
-
 #include "system/time.h"
 #include "system/wait.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)
+#define class #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define private #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define public #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define protected #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define template #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define this #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define new #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define delete #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define friend #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#endif
+
 /* Lists, trees, caching, database... */
-#include <stdlib.h>
-#include <stdbool.h>
 #include <talloc.h>
 #ifndef _PRINTF_ATTRIBUTE
 #define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
 #endif
-#include "../lib/util/util.h"
+#include "../lib/util/xfile.h"
+#include "../lib/util/attr.h"
 #include "../lib/util/debug.h"
+#include "../lib/util/util.h"
 
 #include "libcli/util/error.h"
 
@@ -55,10 +69,4 @@
 #define TALLOC_ABORT(reason) smb_panic(reason)
 #endif
 
-/* this needs to be a string which is not in the C library. We
-   previously used "init_module", but that meant that modules which
-   did not define this function ended up calling the C library
-   function init_module() which makes a system call */
-#define SAMBA_INIT_MODULE "samba_init_module"
-
 #endif /* _INCLUDES_H */