This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[fixincludes] improve bypass for bool fix


This avoids a bogus fix which would otherwise trigger when Sequent/ptx 
switches to regular fixincludes.  I couldn't convince myself that
"__cplusplus" was present in every file which said "we must use the
C++ compiler's type", although it was true on my Linux box.  However,
if you (Bruce) would prefer, I could take the risk and remove the old
bypass.

This also adds a little note about Interix. :-)

	* fixinc/inclhack.def (avoid_bool_define, avoid_bool_type): Bypass
	with __cplusplus.
	* fixinc/inclhack.def (void_null): Note that Interix needs this.
	* fixinc/fixincl.x: Regenerate.

Index: inclhack.def
===================================================================
RCS file: /cvs/gcc/gcc/gcc/fixinc/inclhack.def,v
retrieving revision 1.165
diff -u -r1.165 inclhack.def
--- inclhack.def	13 Jul 2003 06:52:25 -0000	1.165
+++ inclhack.def	14 Jul 2003 17:42:40 -0000
@@ -604,6 +604,7 @@
     files     = tinfo.h;
 
     select    = "#[ \t]*define[ \t]+bool[ \t]";
+    bypass    = "__cplusplus";
     bypass    = "we must use the C\\+\\+ compiler's type";
 
     c_fix     = format;
@@ -622,6 +623,7 @@
     files    = tinfo.h;
 
     select    = "^[ \t]*typedef[ \t].*[ \t]bool[ \t]*;";
+    bypass    = "__cplusplus";
     bypass    = "we must use the C\\+\\+ compiler's type";
 
     c_fix     = format;
@@ -3362,7 +3364,7 @@
 
 
 /*
- *  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 = {

-- 
Nathanael Nerode  <neroden at gcc.gnu.org>
http://home.twcny.rr.com/nerode/neroden/fdl.html


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]