From 4347799f26004de07dffd617eddfb3989af5c24b Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 24 May 2006 14:38:11 +0000 Subject: 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) --- source3/include/includes.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source3/include') 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 -- cgit