inclhack.def (avoid_bool): Also catch "typedef [unsigned] int bool".

* fixinc/inclhack.def (avoid_bool): Also catch
        "typedef [unsigned] int bool".
        * fixinc/inclhack.sh, fixinc/fixincl.x, fixinc/fixincl.sh: Rebuilt.

From-SVN: r27418

gcc/ChangeLog

@@ -1,5 +1,9 @@
 Mon Jun  7 22:30:37 1999  Jeffrey A Law  (law@cygnus.com)
 
+	* fixinc/inclhack.def (avoid_bool): Also catch
+	"typedef [unsigned] int bool".
+	* fixinc/inclhack.sh, fixinc/fixincl.x, fixinc/fixincl.sh: Rebuilt.
+
 	* m68k/x-hp3bsd44: Delete obsolete and incorrect file.
 	* configure.in (m68k-hp-bsd4.4): No longer use x-hp3bsd44.
 	* configure: Rebuilt.

gcc/fixinc/fixincl.x

@@ -335,6 +335,14 @@ const char* apzAvoid_BoolPatch[] = { "sed",
     "-e", "/^[ ]*typedef[ \t][ \t]*unsigned char[ \t][ \t]*bool[ \t]*;/i\\\n\
 #ifndef __cplusplus\n",
     "-e", "/^[ ]*typedef[ \t][ \t]*unsigned char[ \t][ \t]*bool[ \t]*;/a\\\n\
+#endif\n",
+    "-e", "/^typedef[ \t][ \t]*int[ \t][ \t]*bool[ \t]*;/i\\\n\
+#ifndef __cplusplus\n",
+    "-e", "/^typedef[ \t][ \t]*int[ \t][ \t]*bool[ \t]*;/a\\\n\
+#endif\n",
+    "-e", "/^[ ]*typedef[ \t][ \t]*unsigned int[ \t][ \t]*bool[ \t]*;/i\\\n\
+#ifndef __cplusplus\n",
+    "-e", "/^[ ]*typedef[ \t][ \t]*unsigned int[ \t][ \t]*bool[ \t]*;/a\\\n\
 #endif\n",
     (char*)NULL };
 

gcc/fixinc/inclhack.def

@@ -136,6 +136,18 @@ fix = {
 
     sed = "/^[ ]*typedef[ \t][ \t]*unsigned char[ \t][ \t]*bool[ \t]*;/a\\\n"
                 "#endif\n";
+
+    sed = "/^typedef[ \t][ \t]*int[ \t][ \t]*bool[ \t]*;/i\\\n"
+                "#ifndef __cplusplus\n";
+
+    sed = "/^typedef[ \t][ \t]*int[ \t][ \t]*bool[ \t]*;/a\\\n"
+                "#endif\n";
+
+    sed = "/^[ ]*typedef[ \t][ \t]*unsigned int[ \t][ \t]*bool[ \t]*;/i\\\n"
+                "#ifndef __cplusplus\n";
+
+    sed = "/^[ ]*typedef[ \t][ \t]*unsigned int[ \t][ \t]*bool[ \t]*;/a\\\n"
+                "#endif\n";
 };
 
 

gcc/fixinc/inclhack.sh

@@ -562,6 +562,18 @@ struct rusage;
 ' \
         -e '/^[ ]*typedef[ 	][ 	]*unsigned char[ 	][ 	]*bool[ 	]*;/a\
 #endif
+' \
+        -e '/^typedef[ 	][ 	]*int[ 	][ 	]*bool[ 	]*;/i\
+#ifndef __cplusplus
+' \
+        -e '/^typedef[ 	][ 	]*int[ 	][ 	]*bool[ 	]*;/a\
+#endif
+' \
+        -e '/^[ ]*typedef[ 	][ 	]*unsigned int[ 	][ 	]*bool[ 	]*;/i\
+#ifndef __cplusplus
+' \
+        -e '/^[ ]*typedef[ 	][ 	]*unsigned int[ 	][ 	]*bool[ 	]*;/a\
+#endif
 ' \
           < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}