diff options
| author | Paul N. Hilfinger <hilfingr@CS.Berkeley.EDU> | 1997-09-02 18:38:30 +0000 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 1997-09-02 12:38:30 -0600 |
| commit | a94729bc72dad85c039ebd062dfdd72722994033 (patch) | |
| tree | 704454c2f60d4abcc181095e6be454ad5deb8981 /gcc | |
| parent | 2eddfed1f242d4c8ab33faec15e52eef1cbff6f4 (diff) | |
| download | gcc-a94729bc72dad85c039ebd062dfdd72722994033.zip gcc-a94729bc72dad85c039ebd062dfdd72722994033.tar.gz gcc-a94729bc72dad85c039ebd062dfdd72722994033.tar.bz2 | |
fixincludes: Permits spaces between # and define.
* fixincludes: Permits spaces between # and define. Discard C++
comments in sys/pci.h on HP/UX 10.20.
From-SVN: r15034
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rwxr-xr-x | gcc/fixincludes | 23 |
2 files changed, 23 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d28a963d..94e3097 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +Tue Sep 2 13:42:38 1997 Paul N. Hilfinger <hilfingr@CS.Berkeley.EDU> + + * fixincludes: Permits spaces between # and define. Discard C++ + comments in sys/pci.h on HP/UX 10.20. + Mon Sep 1 22:13:18 1997 Jeffrey A Law (law@cygnus.com) * version.c: Bump for snapshot. diff --git a/gcc/fixincludes b/gcc/fixincludes index 6f7ab38..33ef8ad 100755 --- a/gcc/fixincludes +++ b/gcc/fixincludes @@ -283,13 +283,14 @@ while [ $# != 0 ]; do /\/\/[^*]/ s|//\(.*\)$|/*\1*/| /[ ]_IO[A-Z]*[ ]*(/ s/\(_IO[A-Z]*[ ]*(\)\(.\),/\1'\''\2'\'',/ /[ ]BSD43__IO[A-Z]*[ ]*(/ s/(\(.\),/('\''\1'\'',/ - /#define._IO/ s/'\''\([cgxtf]\)'\''/\1/g - /#define.BSD43__IO/ s/'\''\([cgx]\)'\''/\1/g + /#[ ]*define[ ]*[ ]_IO/ s/'\''\([cgxtf]\)'\''/\1/g + /#[ ]*define[ ]*[ ]BSD43__IO/ s/'\''\([cgx]\)'\''/\1/g + /#[ ]*define[ ]*[ ]DESIOC/ s/'\''\([cdgx]\)'\''/\1/g /[^A-Z0-9_]CTRL[ ]*(/ s/\([^'\'']\))/'\''\1'\'')/ /[^A-Z0-9]_CTRL[ ]*(/ s/\([^'\'']\))/'\''\1'\'')/ - /#define[ ]*[ ]CTRL/ s/'\''\([cgx]\)'\''/\1/g - /#define[ ]*[ ]_CTRL/ s/'\''\([cgx]\)'\''/\1/g - /#define.BSD43_CTRL/ s/'\''\([cgx]\)'\''/\1/g + /#[ ]*define[ ]*[ ]CTRL/ s/'\''\([cgx]\)'\''/\1/g + /#[ ]*define[ ]*[ ]_CTRL/ s/'\''\([cgx]\)'\''/\1/g + /#[ ]*define.BSD43_CTRL/ s/'\''\([cgx]\)'\''/\1/g /#[ ]*[el]*if/{ s/[a-zA-Z0-9_][a-zA-Z0-9_]*/ & /g @@ -1113,6 +1114,18 @@ if [ -r ${LIB}/$file ]; then fi fi +# And also with the HP-UX 10 sys/pci.h file +file=sys/pci.h +if [ -r ${LIB}/$file ]; then + if egrep 'System Private Structures' ${LIB}/$file > /dev/null; then + echo Fixing $file, overeager sed script + rm ${LIB}/$file + sed -e 's|//.*$||g' $file > ${LIB}/$file + chmod +w ${LIB}/$file 2>/dev/null + chmod a+r ${LIB}/$file 2>/dev/null + fi +fi + # Some IRIX header files contains the string "//" for file in elf_abi.h elf.h; do if [ -r ${LIB}/$file ]; then |