diff options
| author | Bruce Korb <ddsinc09@ix.netcom.com> | 1999-06-03 07:56:01 +0000 |
|---|---|---|
| committer | Bruce Korb <korbb@gcc.gnu.org> | 1999-06-03 07:56:01 +0000 |
| commit | 5403593a4401fca1ef78e3926effc637ae435369 (patch) | |
| tree | 1c408c297361490209a71a85a56646dc566a36b3 | |
| parent | b4f70b3d4214872f1bb55c2f63c0ce030d4f8bb8 (diff) | |
| download | gcc-5403593a4401fca1ef78e3926effc637ae435369.zip gcc-5403593a4401fca1ef78e3926effc637ae435369.tar.gz gcc-5403593a4401fca1ef78e3926effc637ae435369.tar.bz2 | |
Io_Def_Quotes): corrected sed expression
From-SVN: r27327
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fixinc/fixincl.x | 3 | ||||
| -rw-r--r-- | gcc/fixinc/inclhack.def | 3 | ||||
| -rwxr-xr-x | gcc/fixinc/inclhack.sh | 3 |
4 files changed, 12 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 935980a..eed6ef1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +Thu Jun 3 07:48 1999 Bruce Korb <ddsinc09@ix.netcom.com> + + *fixinc/inclhack.def(Io_Def_Quotes): corrected sed expression + *fixinc/fixincl.x: regenerate + *fixinc/inclhack.sh: regenerate + Thu Jun 3 02:15:07 1999 Jason Merrill <jason@yorick.cygnus.com> * dwarf2out.c (add_incomplete_type): New fn. diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index 5b820f9..df186d5 100644 --- a/gcc/fixinc/fixincl.x +++ b/gcc/fixinc/fixincl.x @@ -1079,7 +1079,8 @@ tTestDesc aIo_Def_QuotesTests[] = { * Fix Command Arguments for Io_Def_Quotes */ const char* apzIo_Def_QuotesPatch[] = { "sed", - "-e", "s/\\([ \t]*[ \t](_|DES)IO[A-Z]*[ \t]*(\\)\\([^,']\\),/\\1'\\2',/", + "-e", "s/\\([ \t]*[ \t]_IO[A-Z]*[ \t]*(\\)\\([^,']\\),/\\1'\\2',/", + "-e", "s/\\([ \t]*[ \t]DESIO[A-Z]*[ \t]*(\\)\\([^,']\\),/\\1'\\2',/", "-e", "/#[ \t]*define[ \t]*[ \t]_IO/s/'\\([cgxtf]\\)'/\\1/g", "-e", "/#[ \t]*define[ \t]*[ \t]DESIOC/s/'\\([cdgx]\\)'/\\1/g", (char*)NULL }; diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def index c8dbeda..c3a06ba 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -567,7 +567,8 @@ fix = { fix = { hackname = io_def_quotes; select = "[ \t]*[ \t](_|DES)IO[A-Z]*[ \t]*\\( *[^,']"; - sed = "s/\\([ \t]*[ \t](_|DES)IO[A-Z]*[ \t]*(\\)\\([^,']\\),/\\1'\\2',/"; + sed = "s/\\([ \t]*[ \t]_IO[A-Z]*[ \t]*(\\)\\([^,']\\),/\\1'\\2',/"; + sed = "s/\\([ \t]*[ \t]DESIO[A-Z]*[ \t]*(\\)\\([^,']\\),/\\1'\\2',/"; sed = "/#[ \t]*define[ \t]*[ \t]_IO/" "s/'\\([cgxtf]\\)'/\\1/g"; sed = "/#[ \t]*define[ \t]*[ \t]DESIOC/" 's/\'\([cdgx]\)\'/\1/g'; }; diff --git a/gcc/fixinc/inclhack.sh b/gcc/fixinc/inclhack.sh index d9ea8f9..536b0a3 100755 --- a/gcc/fixinc/inclhack.sh +++ b/gcc/fixinc/inclhack.sh @@ -1056,7 +1056,8 @@ extern "C" {\ then infile=${file} else infile=${DESTFILE} ; fi - sed -e 's/\([ ]*[ ](_|DES)IO[A-Z]*[ ]*(\)\([^,'\'']\),/\1'\''\2'\'',/' \ + sed -e 's/\([ ]*[ ]_IO[A-Z]*[ ]*(\)\([^,'\'']\),/\1'\''\2'\'',/' \ + -e 's/\([ ]*[ ]DESIO[A-Z]*[ ]*(\)\([^,'\'']\),/\1'\''\2'\'',/' \ -e '/#[ ]*define[ ]*[ ]_IO/s/'\''\([cgxtf]\)'\''/\1/g' \ -e '/#[ ]*define[ ]*[ ]DESIOC/s/'\''\([cdgx]\)'\''/\1/g' \ < $infile > ${DESTDIR}/fixinc.tmp |