svn commit: samba r15864 - branches/SAMBA_3_0/source/include trunk/source/include

[jerry at samba.org]

Author: jerry
Date: 2006-05-24 14:38:11 +0000 (Wed, 24 May 2006)
New Revision: 15864

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15864

Log:
build fixes for IRIX 6.4 in the build farm; only enable the C++ reserved word check when we selecte --enable-developer
Modified:
   branches/SAMBA_3_0/source/include/includes.h
   trunk/source/include/includes.h


Changeset:
Modified: branches/SAMBA_3_0/source/include/includes.h
===================================================================
--- branches/SAMBA_3_0/source/include/includes.h	2006-05-24 14:26:34 UTC (rev 15863)
+++ branches/SAMBA_3_0/source/include/includes.h	2006-05-24 14:38:11 UTC (rev 15864)
@@ -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

Modified: trunk/source/include/includes.h
===================================================================
--- trunk/source/include/includes.h	2006-05-24 14:26:34 UTC (rev 15863)
+++ trunk/source/include/includes.h	2006-05-24 14:38:11 UTC (rev 15864)
@@ -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