From 31eec874a142a408e278a62a7de6639f490ce87c Mon Sep 17 00:00:00 2001
From: Mike Stump <mrs@apple.com>
Date: Thu, 28 Oct 2004 21:44:31 +0000
Subject: [PATCH] inclhack.def: Avoid changing NULL on C++ friendly systems.

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

From-SVN: r89786
---
 fixincludes/ChangeLog    |  5 +++++
 fixincludes/fixincl.x    | 15 +++++++++++----
 fixincludes/inclhack.def |  2 ++
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index defdb6517e0..5161dd6c463 100644
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-28  Mike Stump  <mrs@apple.com>
+
+	* inclhack.def: Avoid changing NULL on C++ friendly systems.
+	* fixincl.x: Regenerate.
+
 2004-10-27  Geoffrey Keating  <geoffk@apple.com>
 
 	* inclhack.def (darwin_gcc4_breakage): New.
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
 
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index 00c5ae6aba3..084594c2c0f 100644
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -3963,6 +3963,8 @@ fix = {
     files     = sys/dir.h;
     files     = sys/param.h;
     files     = sys/types.h;
+    /* avoid changing C++ friendly NULL */
+    bypass    = __cplusplus;
     select    = "^#[ \t]*define[ \t]+NULL[ \t]+\\(\\(void[ \t]*\\*\\)0\\)";
     c_fix     = format;
     c_fix_arg = "#define NULL 0";
-- 
2.11.4.GIT