summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2006-05-24 14:38:11 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:17:11 -0500
commit4347799f26004de07dffd617eddfb3989af5c24b (patch)
treeb262fbdbf3effd3ff7216c4b465954841f0aae2e /source3
parent5b558868551076cd03de4c634ce9fe74e46060df (diff)
downloadsamba-4347799f26004de07dffd617eddfb3989af5c24b.tar.gz
samba-4347799f26004de07dffd617eddfb3989af5c24b.tar.bz2
samba-4347799f26004de07dffd617eddfb3989af5c24b.zip
r15864: build fixes for IRIX 6.4 in the build farm; only enable the C++ reserved word check when we selecte --enable-developer
(This used to be commit ece5fe3e78da460fb1c0eca3185da7f80c5cfdc4)
Diffstat (limited to 'source3')
-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