diff options
Diffstat (limited to 'source3/include/includes.h')
| -rw-r--r-- | source3/include/includes.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index da4c98fc72..9ff87557ff 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -25,6 +25,17 @@ #include "config.h" #endif +#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 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 "local.h" #ifdef AIX @@ -55,7 +66,7 @@ #define PRINTF_ATTRIBUTE(a1, a2) #endif -#ifdef __GNUC__ +#if defined(__GNUC__) && !defined(__cplusplus) /** gcc attribute used on function parameters so that it does not emit * warnings about them being unused. **/ # define UNUSED(param) param __attribute__ ((unused)) |