svn commit: samba r7950 - in trunk/source/nsswitch: .

[jra at samba.org]

Author: jra
Date: 2005-06-27 17:31:02 +0000 (Mon, 27 Jun 2005)
New Revision: 7950

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

Log:
Work around for broken Solaris header files.
Jeremy

Modified:
   trunk/source/nsswitch/winbind_nss_solaris.h


Changeset:
Modified: trunk/source/nsswitch/winbind_nss_solaris.h
===================================================================
--- trunk/source/nsswitch/winbind_nss_solaris.h	2005-06-27 17:31:00 UTC (rev 7949)
+++ trunk/source/nsswitch/winbind_nss_solaris.h	2005-06-27 17:31:02 UTC (rev 7950)
@@ -24,7 +24,33 @@
 #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>