Fix the definition of _*ISCTRL() macro

From-SVN: r27589

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cede714e8619844f176055b1693c451d23c17857..b11d109189ef195c51172190661d2b62e929d2b1 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun 18 06:48:30 1999  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       * fixinc/inclhack.def (ioctl_fix_ctrl): Fix the definition of _*ISCTRL().
+       * fixinc/{fixincl.x,inclhack.sh}: regen
+
 Thu Jun 17 13:28:30 1999  David O'Brien <obrien@FreeBSD.org>
 
        * i386/freebsd-elf.h (LINK_SPEC): Fix typo.

diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index be8a8f4aa07d1f629f54188b86a859268a511bb9..939220618a554191731534523f25d8800e9b9786 100644 (file)
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -1120,6 +1120,7 @@ const char* apzIoctl_Fix_CtrlPatch[] = { "sed",
     "-e", "/#[ \t]*define[ \t]*[ \t]CTRL/s/'\\([cgx]\\)'/\\1/g",
     "-e", "/#[ \t]*define[ \t]*[ \t]_CTRL/s/'\\([cgx]\\)'/\\1/g",
     "-e", "/#[ \t]*define[ \t]*[ \t]BSD43_CTRL/s/'\\([cgx]\\)'/\\1/g",
+    "-e", "/#[ \t]*define[ \t]*[ \t]_*ISCTRL/s/'\\([cgx]\\)'/\\1/g",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *

diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index 2abc7bd4e5d0b76222d0a328648c70d056964b39..e1d2db4656c9aca591327f24f3c8768e3b5610d5 100644 (file)
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -622,6 +622,9 @@ fix = {
 
     sed = "/#[ \t]*define[ \t]*[ \t]BSD43_CTRL/"
               "s/'\\([cgx]\\)'/\\1/g";
+
+    sed = "/#[ \t]*define[ \t]*[ \t]_*ISCTRL/"
+              "s/'\\([cgx]\\)'/\\1/g";
 };
 
 

diff --git a/gcc/fixinc/inclhack.sh b/gcc/fixinc/inclhack.sh
index 983941f87671c105a510a0034a723f9eb78172cd..a662af5a74b92eed801be85cea3fc36f112dc147 100755 (executable)
--- a/gcc/fixinc/inclhack.sh
+++ b/gcc/fixinc/inclhack.sh
@@ -1091,6 +1091,7 @@ extern "C" {\
         -e '/#[        ]*define[       ]*[     ]CTRL/s/'\''\([cgx]\)'\''/\1/g' \
         -e '/#[        ]*define[       ]*[     ]_CTRL/s/'\''\([cgx]\)'\''/\1/g' \
         -e '/#[        ]*define[       ]*[     ]BSD43_CTRL/s/'\''\([cgx]\)'\''/\1/g' \
+        -e '/#[        ]*define[       ]*[     ]_*ISCTRL/s/'\''\([cgx]\)'\''/\1/g' \
           < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}