summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2006-02-22 11:47:41 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:10:20 -0500
commit2a0ad559ad9cfdddfff347e2542ee50594435eee (patch)
tree1bd19191d4dd77c7b9c8dd39b37c6e879fe68430
parentcab298856ab1179cdaec2ef89121f7c66c6b6d76 (diff)
downloadsamba-2a0ad559ad9cfdddfff347e2542ee50594435eee.tar.gz
samba-2a0ad559ad9cfdddfff347e2542ee50594435eee.tar.bz2
samba-2a0ad559ad9cfdddfff347e2542ee50594435eee.zip
r13625: Now that Heimdal 0.7.2 is released, we reenable our strict checking for
c++ reserved names. Guenther (This used to be commit e0b50d008728cfc66f6b1eefdadf8a708f4d9500)
-rw-r--r--source3/include/includes.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 210c0040b5..407c68b4c3 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -27,8 +27,7 @@
#ifndef __cplusplus
#define class #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
-/* allow to build with newer heimdal releases */
-/* #define private #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