Io_Def_Quotes): corrected sed expression

From-SVN: r27327

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 935980a89e493e1aa1dd6a0466489b040bd82047..eed6ef18697d8276d8849bff8ecc10849f8438cd 100644 (file)
--- 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 5b820f93a4479e1dfdadbb16d2318932b61a50a0..df186d5dc8f55e649fcbb2be535e0523d1290faf 100644 (file)
--- 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 c8dbeda69b5b0fcf01fb8cbd6e82260a643c9b19..c3a06ba1976b9db17d0a4c608a739984079e81af 100644 (file)
--- 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 d9ea8f90d0abef2de28d721a4d766c05b1b9080c..536b0a36273f7b5e7ea87100402d86e232260cf3 100755 (executable)
--- 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