1 --- samba-3.0.21/source3/include/includes.h.orig 2005-12-25 18:08:07.204427000 +0100
2 +++ samba-3.0.21/source3/include/includes.h 2005-12-25 18:11:14.004427000 +0100
4 #define protected #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
5 #define template #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
6 #define this #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
7 -#define new #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
8 +/* #define new #error DONT_USE_CPLUSPLUS_RESERVED_NAMES */
9 #define delete #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
10 #define friend #error DONT_USE_CPLUSPLUS_RESERVED_NAMES