git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5b55886
)
r15864: build fixes for IRIX 6.4 in the build farm; only enable the C++ reserved...
author
Gerald Carter
<jerry@samba.org>
Wed, 24 May 2006 14:38:11 +0000
(14:38 +0000)
committer
Gerald (Jerry) Carter
<jerry@samba.org>
Wed, 10 Oct 2007 16:17:11 +0000
(11:17 -0500)
(This used to be commit
ece5fe3e78da460fb1c0eca3185da7f80c5cfdc4
)
source3/include/includes.h
patch
|
blob
|
history
diff --git
a/source3/include/includes.h
b/source3/include/includes.h
index b9267a7d839ed4bcfcd575005326f57ff03f69e4..e6358f5abb404e0b15fa619feeb5f7d785b06bb0 100644
(file)
--- 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