diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-02-05 16:39:28 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-02-05 16:39:28 +0100 |
| commit | 6d139ca4680abcbda5110f2f0886aa038ff62088 (patch) | |
| tree | 7d61db40fb058bcbf08ccd8e0dadc365b819371b /source4/include | |
| parent | 4a9b3052caeb8bb144803b49dcfae82395172bc3 (diff) | |
| parent | afa960cbbcd609123d710c301e7a9a070c1fed70 (diff) | |
| download | samba-6d139ca4680abcbda5110f2f0886aa038ff62088.tar.gz samba-6d139ca4680abcbda5110f2f0886aa038ff62088.tar.bz2 samba-6d139ca4680abcbda5110f2f0886aa038ff62088.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Conflicts:
librpc/ndr.pc.in
Diffstat (limited to 'source4/include')
| -rw-r--r-- | source4/include/includes.h | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h index f925e836c5..d9b7759e7e 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -33,9 +33,23 @@ #include "system/time.h" #include "system/wait.h" +/* only do the C++ reserved word check when we compile + 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) +#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 + /* Lists, trees, caching, database... */ -#include <stdlib.h> -#include <stdbool.h> #include <talloc.h> #ifndef _PRINTF_ATTRIBUTE #define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2) |