fix a selection expression, skip a bypass

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@27467 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c52ae7e..be98eeb 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jun 10 06:55 1999  Bruce Korb <ddsinc09@ix.netcom.com>
+
+       *fixinc/inclhack.def(sun_auth_proto): We do not know how to
+       test for the presence of valid prototypes.  Delete bypass expr.
+       (ioctl_fix_ctrl): Correct the selection expression.
+
 Thu Jun 10 15:08:15 1999  Nick Clifton  <nickc@cygnus.com>
 
        * config/arm/arm.c (struct all_cores): Add ARM920 and ARM920t.

diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index 7153970..829c83e 100644 (file)
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -600,7 +600,7 @@ fix = {
  */
 fix = {
     hackname = ioctl_fix_ctrl;
-    select = "CTRL[ \t]";
+    select = "CTRL[ \t]*\\(";
 
     sed = "/[^A-Z0-9_]CTRL[ \t]*(/"
               "s/\\([^']\\))/'\\1')/";
@@ -1517,13 +1517,9 @@ fix = {
     files    = rpc/svc.h;
     files    = rpc/xdr.h;
     /*
-     *  Select those files containing '(*name)()' but *not*
-     *  containing '(*name)(junk)'.  The change would be innocuous
-     *  but there is no point bothering if the fix is not needed.
+     *  Select those files containing '(*name)()'.
      */
     select   = '\(\*[a-z][a-z_]*\)\(\)';
-    bypass   = "^[a-zA-Z0-9_ \t]*" '\(\*[a-z][a-z_]*\)\('
-               "[ \t]*[a-zA-Z.].*" '\)';
     sed      = 's'
                 '/^\(.*(\*[a-z][a-z_]*)(\)'      '\();.*\)'
                 "/\\\n"