From: mrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 25 Oct 2011 20:07:19 +0000 (+0000)
Subject:         PR target/48851
X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=f7ac4170bd859ce6e24e8ca0779554efa840ecdd

    PR target/48851
	* inclhack.def (void_null): New bypass.
	* fixincl.x: Regenerate.


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

diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index cb67edccde9..a73eaacea2f 100644
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-25  Mike Stump  <mikestump@comcast.net>
+
+	PR target/48851
+	* inclhack.def (void_null): New bypass.
+	* fixincl.x: Regenerate.
+
 2011-09-26  Tristan Gingold  <gingold@adacore.com>
 
 	* inclhack.def (ms_define_can_use_extern_prefix):
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index cc25834c399..0f5e5fcae8e 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  September 22, 2011 at 04:28:52 PM by AutoGen 5.11.1
+ * It has been AutoGen-ed  Sunday October 23, 2011 at 12:18:29 PM EST
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT SVN-MERGE THIS FILE, EITHER Thu Sep 22 16:28:52 CEST 2011
+/* DO NOT SVN-MERGE THIS FILE, EITHER Sun Oct 23 12:18:29 EST 2011
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -8587,10 +8587,13 @@ tSCC zVoid_NullSelect0[] =
  */
 tSCC zVoid_NullBypass0[] =
        "__cplusplus";
+tSCC zVoid_NullBypass1[] =
+       "__null";
 
-#define    VOID_NULL_TEST_CT  2
+#define    VOID_NULL_TEST_CT  3
 static tTestDesc aVoid_NullTests[] = {
   { TT_NEGREP,   zVoid_NullBypass0, (regex_t*)NULL },
+  { TT_NEGREP,   zVoid_NullBypass1, (regex_t*)NULL },
   { TT_EGREP,    zVoid_NullSelect0, (regex_t*)NULL }, };
 
 /*
@@ -8953,7 +8956,7 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          261
+#define REGEX_COUNT          262
 #define MACH_LIST_SIZE_LIMIT 181
 #define FIX_COUNT            220
 
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index afaabc0422d..7445d99f00b 100644
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -4585,6 +4585,7 @@ fix = {
     files     = sys/types.h;
     /* avoid changing C++ friendly NULL */
     bypass    = __cplusplus;
+    bypass    = __null;
     select    = "^#[ \t]*define[ \t]+NULL[ \t]+\\(\\(void[ \t]*\\*\\)0\\)";
     c_fix     = format;
     c_fix_arg = "#define NULL 0";