* fixinc/inclhack.def (avoid_bool): Also catch

        "typedef [unsigned] int bool".
        * fixinc/inclhack.sh, fixinc/fixincl.x, fixinc/fixincl.sh: Rebuilt.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3dda21a..a0ff955 100644 (file)
--- a/gcc/ChangeLog
+++ b/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.

diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index c7eb180..9b8ddec 100644 (file)
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -336,6 +336,14 @@ const char* apzAvoid_BoolPatch[] = { "sed",
 #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 };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *

diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index 9e9cd4f..0695368 100644 (file)
--- a/gcc/fixinc/inclhack.def
+++ b/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";
 };
 
 

diff --git a/gcc/fixinc/inclhack.sh b/gcc/fixinc/inclhack.sh
index 13f56a7..fda21b6 100755 (executable)
--- a/gcc/fixinc/inclhack.sh
+++ b/gcc/fixinc/inclhack.sh
@@ -563,6 +563,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}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}