* inclhack.def: Avoid changing NULL on C++ friendly systems.

        * fixincl.x: Regenerate.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@89786 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 11 insertions, 4 deletions

diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index 69098aefa90..948c7279376 100644
--- a/fixincludes/fixincl.x
+++ b/fixincludes/fixincl.x
@@ -2,11 +2,11 @@
  * 
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been AutoGen-ed  Tuesday October 26, 2004 at 01:55:22 PM PDT
+ * It has been AutoGen-ed  Thursday October 28, 2004 at 01:52:23 PM PDT
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT CVS-MERGE THIS FILE, EITHER Tue Oct 26 13:55:22 PDT 2004
+/* DO NOT CVS-MERGE THIS FILE, EITHER Thu Oct 28 13:52:23 PDT 2004
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -6684,8 +6684,15 @@ tSCC zVoid_NullList[] =
 tSCC zVoid_NullSelect0[] =
        "^#[ \t]*define[ \t]+NULL[ \t]+\\(\\(void[ \t]*\\*\\)0\\)";
 
-#define    VOID_NULL_TEST_CT  1
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zVoid_NullBypass0[] =
+       "__cplusplus";
+
+#define    VOID_NULL_TEST_CT  2
 static tTestDesc aVoid_NullTests[] = {
+  { TT_NEGREP,   zVoid_NullBypass0, (regex_t*)NULL },
   { TT_EGREP,    zVoid_NullSelect0, (regex_t*)NULL }, };
 
 /*
@@ -7139,7 +7146,7 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          203
+#define REGEX_COUNT          204
 #define MACH_LIST_SIZE_LIMIT 261
 #define FIX_COUNT            180