diff options
| author | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-06-08 00:10:51 +0000 |
|---|---|---|
| committer | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-06-08 00:10:51 +0000 |
| commit | 02f88d3c5e4fdd3832bb1f8e52ee8af1b84b4865 (patch) | |
| tree | 9f270387f32481fd6442510686d87c2589e9b49b | |
| parent | d0f4b2e510b484b04ee79681bf48633f0068ad69 (diff) | |
| download | ppe42-gcc-02f88d3c5e4fdd3832bb1f8e52ee8af1b84b4865.tar.gz ppe42-gcc-02f88d3c5e4fdd3832bb1f8e52ee8af1b84b4865.zip | |
* 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
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/fixinc/fixincl.x | 8 | ||||
| -rw-r--r-- | gcc/fixinc/inclhack.def | 12 | ||||
| -rwxr-xr-x | gcc/fixinc/inclhack.sh | 12 |
4 files changed, 36 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3dda21a6edd..a0ff9551c52 100644 --- 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 c7eb180dde5..9b8ddec0ddf 100644 --- 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 9e9cd4fd77f..0695368e232 100644 --- 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 13f56a7c81b..fda21b63820 100755 --- 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} |
