summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-11-17 20:36:37 +1100
committerAndrew Tridgell <tridge@samba.org>2010-11-17 23:55:39 +1100
commit9432eabb2f6ba282943e1b7ea4e90c0ed38cefe2 (patch)
tree9e6ce109b53f81c25d880076b22752f8cf28f598
parentd7ea449049e6536c4c25274dc24d9eaa90cb7abd (diff)
downloadsamba-9432eabb2f6ba282943e1b7ea4e90c0ed38cefe2.tar.gz
samba-9432eabb2f6ba282943e1b7ea4e90c0ed38cefe2.tar.bz2
samba-9432eabb2f6ba282943e1b7ea4e90c0ed38cefe2.zip
developer: only do the C++ reserved name checking on Linux
this prevents us breaking the solaris build, but will still mean we prevent C++ vars in our code
-rw-r--r--nsswitch/winbind_nss_solaris.h26
-rw-r--r--source3/include/includes.h2
-rw-r--r--source4/include/includes.h2
3 files changed, 2 insertions, 28 deletions
diff --git a/nsswitch/winbind_nss_solaris.h b/nsswitch/winbind_nss_solaris.h
index f805542f75..011330576d 100644
--- a/nsswitch/winbind_nss_solaris.h
+++ b/nsswitch/winbind_nss_solaris.h
@@ -22,33 +22,7 @@
#ifndef _WINBIND_NSS_SOLARIS_H
#define _WINBIND_NSS_SOLARIS_H
-/* Solaris has a broken nss_common header file containing C++ reserved names. */
-#ifndef __cplusplus
-#undef class
-#undef private
-#undef public
-#undef protected
-#undef template
-#undef this
-#undef new
-#undef delete
-#undef friend
-#endif
-
#include <nss_common.h>
-
-#ifndef __cplusplus
-#define class #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
-#define private #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
-#define public #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
-#define protected #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
-#define template #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
-#define this #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
-#define new #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
-#define delete #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
-#define friend #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
-#endif
-
#include <nss_dbdefs.h>
#include <nsswitch.h>
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 11066e25ad..87061eba34 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -34,7 +34,7 @@
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)
+#if !defined(__cplusplus) && defined(DEVELOPER) && defined(__linux__)
#define class #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
#define private #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
#define public #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
diff --git a/source4/include/includes.h b/source4/include/includes.h
index 796e313572..d0a97020c6 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -38,7 +38,7 @@
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)
+#if !defined(__cplusplus) && defined(DEVELOPER) && defined(__linux__)
#define class #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
#define private #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
#define public #error DONT_USE_CPLUSPLUS_RESERVED_NAMES