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 | 919af50f2722382aca4ce516029b0a19443d79ec (patch) | |
| tree | a09f0bdca243c5f4fecf516a8e33f98d1c6f2521 /source3/nsswitch | |
| parent | afc7af3fdf3ec8214dff8924734008eb41c81979 (diff) | |
| download | samba-919af50f2722382aca4ce516029b0a19443d79ec.tar.gz samba-919af50f2722382aca4ce516029b0a19443d79ec.tar.bz2 samba-919af50f2722382aca4ce516029b0a19443d79ec.zip | |
r7949: Work around for broken Solaris header files.
Jeremy
(This used to be commit 4d5002931056d2a88d49ce060c10bc0fecf4ba50)
Diffstat (limited to 'source3/nsswitch')
| -rw-r--r-- | source3/nsswitch/winbind_nss_solaris.h | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/source3/nsswitch/winbind_nss_solaris.h b/source3/nsswitch/winbind_nss_solaris.h index 567de411aa..a3ba762995 100644 --- a/source3/nsswitch/winbind_nss_solaris.h +++ b/source3/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> |