* fixinc/inclhack.def (avoid_bool_define, avoid_bool_type): Bypass

	with __cplusplus, not "we must use the C++ compiler's type"
	* fixinc/inclhack.def (void_null): Note that Interix needs this.
	* fixinc/fixincl.x: Regenerate.


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

gcc/ChangeLog

+2003-07-14  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* fixinc/inclhack.def (avoid_bool_define, avoid_bool_type): Bypass
+	with __cplusplus, not "we must use the C++ compiler's type"
+	* fixinc/inclhack.def (void_null): Note that Interix needs this.
+	* fixinc/fixincl.x: Regenerate.
+
 2003-07-14  Geoffrey Keating  <geoffk@apple.com>
 	* unwind-dw2-fde-darwin.c (live_image_destructor): Get seen_objects

gcc/fixinc/fixincl.x

@@ -2,11 +2,11 @@
  * 
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been AutoGen-ed  Sunday July 13, 2003 at 02:48:14 AM EDT
+ * It has been AutoGen-ed  Monday July 14, 2003 at 08:37:56 PM EDT
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT CVS-MERGE THIS FILE, EITHER Sun Jul 13 02:48:14 EDT 2003
+/* DO NOT CVS-MERGE THIS FILE, EITHER Mon Jul 14 20:37:56 EDT 2003
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -919,7 +919,7 @@ tSCC zAvoid_Bool_DefineSelect0[] =
  *  content bypass pattern - skip fix if pattern found
  */
 tSCC zAvoid_Bool_DefineBypass0[] =
-       "we must use the C\\+\\+ compiler's type";
+       "__cplusplus";
 
 #define    AVOID_BOOL_DEFINE_TEST_CT  2
 static tTestDesc aAvoid_Bool_DefineTests[] = {
@@ -964,7 +964,7 @@ tSCC zAvoid_Bool_TypeSelect0[] =
  *  content bypass pattern - skip fix if pattern found
  */
 tSCC zAvoid_Bool_TypeBypass0[] =
-       "we must use the C\\+\\+ compiler's type";
+       "__cplusplus";
 
 #define    AVOID_BOOL_TYPE_TEST_CT  2
 static tTestDesc aAvoid_Bool_TypeTests[] = {

gcc/fixinc/inclhack.def

@@ -604,7 +604,7 @@ fix = {
     files     = tinfo.h;
 
     select    = "#[ \t]*define[ \t]+bool[ \t]";
-    bypass    = "we must use the C\\+\\+ compiler's type";
+    bypass    = "__cplusplus";
 
     c_fix     = format;
     c_fix_arg = "#ifndef __cplusplus\n%0\n#endif";
@@ -622,7 +622,7 @@ fix = {
     files    = tinfo.h;
 
     select    = "^[ \t]*typedef[ \t].*[ \t]bool[ \t]*;";
-    bypass    = "we must use the C\\+\\+ compiler's type";
+    bypass    = "__cplusplus";
 
     c_fix     = format;
     c_fix_arg = "#ifndef __cplusplus\n%0\n#endif";
@@ -3362,7 +3362,7 @@ fix = {
 
 
 /*
- *  AIX headers define NULL to be cast to a void pointer,
+ *  AIX and Interix headers define NULL to be cast to a void pointer,
  *  which is illegal in ANSI C++.
  */
 fix = {