projects / packages / samba.git / blame
| Commit | Line | Data |
|---|---|---|
| 40d90f9e AM |
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 | |
| 5c8c9cb6 | 3 | @@ -33,7 +33,7 @@ |
| a8d9e7a2 AM |
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 | |
| 11 | #endif |