summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/include/includes.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index b9267a7d83..e6358f5abb 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -30,7 +30,11 @@
#include "config.h"
#endif
-#ifndef __cplusplus
+/* 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