projects / packages / samba.git / blame
| Commit | Line | Data |
|---|---|---|
| a8d9e7a2 AM |
1 | diff -urN samba-3.0.20.org/source/include/includes.h samba-3.0.20/source/include/includes.h |
| 2 | --- samba-3.0.20.org/source/include/includes.h 2005-07-28 15:19:49.000000000 +0200 | |
| 3 | +++ samba-3.0.20/source/include/includes.h 2005-08-21 20:54:03.904616136 +0200 | |
| 4 | @@ -27,12 +27,12 @@ | |
| 5 | ||
| 6 | #ifndef __cplusplus | |
| 7 | #define class #error DONT_USE_CPLUSPLUS_RESERVED_NAMES | |
| 8 | -#define private #error DONT_USE_CPLUSPLUS_RESERVED_NAMES | |
| 9 | +/* #define private #error DONT_USE_CPLUSPLUS_RESERVED_NAMES */ | |
| 10 | #define public #error DONT_USE_CPLUSPLUS_RESERVED_NAMES | |
| 11 | #define protected #error DONT_USE_CPLUSPLUS_RESERVED_NAMES | |
| 12 | #define template #error DONT_USE_CPLUSPLUS_RESERVED_NAMES | |
| 13 | #define this #error DONT_USE_CPLUSPLUS_RESERVED_NAMES | |
| 14 | -#define new #error DONT_USE_CPLUSPLUS_RESERVED_NAMES | |
| 15 | +/* #define new #error DONT_USE_CPLUSPLUS_RESERVED_NAMES */ | |
| 16 | #define delete #error DONT_USE_CPLUSPLUS_RESERVED_NAMES | |
| 17 | #define friend #error DONT_USE_CPLUSPLUS_RESERVED_NAMES | |
| 18 | #endif |