diff options
author | Jeremy Allison <jra@samba.org> | 2005-06-27 17:31:00 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:58:04 -0500 |
commit | 4d5002931056d2a88d49ce060c10bc0fecf4ba50 (patch) | |
tree | 620549969c7b09916a7f52835192de65cc04f5df | |
parent | 7ef6850056f7fbb380038f5ec5bcb29d27fbf254 (diff) | |
download | samba-4d5002931056d2a88d49ce060c10bc0fecf4ba50.tar.gz samba-4d5002931056d2a88d49ce060c10bc0fecf4ba50.tar.xz samba-4d5002931056d2a88d49ce060c10bc0fecf4ba50.zip |
r7949: Work around for broken Solaris header files.
Jeremy
-rw-r--r-- | source/nsswitch/winbind_nss_solaris.h | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/source/nsswitch/winbind_nss_solaris.h b/source/nsswitch/winbind_nss_solaris.h index 567de411aa6..a3ba7629956 100644 --- a/source/nsswitch/winbind_nss_solaris.h +++ b/source/nsswitch/winbind_nss_solaris.h @@ -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> |