diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-09-15 20:09:29 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:06:46 -0500 |
| commit | 540caf7ea691874436ddfaf440f4b0714e592dce (patch) | |
| tree | fa840ab654b6b64399363eb031a5515d2716d785 /source4/nsswitch/winbind_nss_solaris.h | |
| parent | 9a012df08ee829c1d40fc88ba12a0ea479f60be0 (diff) | |
| download | samba-540caf7ea691874436ddfaf440f4b0714e592dce.tar.gz samba-540caf7ea691874436ddfaf440f4b0714e592dce.tar.bz2 samba-540caf7ea691874436ddfaf440f4b0714e592dce.zip | |
r25181: sync winbind client code with samba3
NOTE: wbinfo.c isn't fully merged here
metze
(This used to be commit eee5327dc2f79c052c2db0ca89f23cc9d2ce355d)
Diffstat (limited to 'source4/nsswitch/winbind_nss_solaris.h')
| -rw-r--r-- | source4/nsswitch/winbind_nss_solaris.h | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/source4/nsswitch/winbind_nss_solaris.h b/source4/nsswitch/winbind_nss_solaris.h index 1c694394d3..84062dbab4 100644 --- a/source4/nsswitch/winbind_nss_solaris.h +++ b/source4/nsswitch/winbind_nss_solaris.h @@ -22,7 +22,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> |