diff options
| -rw-r--r-- | gcc/ChangeLog | 2 | ||||
| -rw-r--r-- | gcc/fixinc/fixincl.x | 2 | ||||
| -rwxr-xr-x | gcc/fixinc/inclhack.sh | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index db91243..515aef5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -2,6 +2,8 @@ Wed Jun 9 06:50 1999 Bruce Korb <ddsinc09@ix.netcom.com> *fixinc/inclhack.def(sun_auth_proto): bypass the patch if the typed arguments are not part of a comment + *fixinc/fixincl.x: regenerate + *fixinc/inclhack.sh: regenerate Wed Jun 9 22:57:02 1999 Michael Hayes <m.hayes@elec.canterbury.ac.nz> diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index 3cc6014..6c65a7c6 100644 --- a/gcc/fixinc/fixincl.x +++ b/gcc/fixinc/fixincl.x @@ -2623,7 +2623,7 @@ tSCC zSun_Auth_ProtoSelect0[] = * content bypass pattern - skip fix if pattern found */ tSCC zSun_Auth_ProtoBypass0[] = - "\\(\\*[a-z][a-z_]*\\)\\([ \t]*[a-zA-Z.].*\\)"; + "^[a-zA-Z0-9_ \t]*\\(\\*[a-z][a-z_]*\\)\\([ \t]*[a-zA-Z.].*\\)"; #define SUN_AUTH_PROTO_TEST_CT 2 #define SUN_AUTH_PROTO_RE_CT 2 diff --git a/gcc/fixinc/inclhack.sh b/gcc/fixinc/inclhack.sh index 66db082..b4ba924 100755 --- a/gcc/fixinc/inclhack.sh +++ b/gcc/fixinc/inclhack.sh @@ -2167,7 +2167,7 @@ void (*signal(...))(...);\ ./rpc/svc.h | \ ./rpc/xdr.h ) if ( test -n "`egrep '\\(\\*[a-z][a-z_]*\\)\\(\\)' ${file}`" -a \ - -z "`egrep '\\(\\*[a-z][a-z_]*\\)\\([ ]*[a-zA-Z.].*\\)' ${file}`" + -z "`egrep '^[a-zA-Z0-9_ ]*\\(\\*[a-z][a-z_]*\\)\\([ ]*[a-zA-Z.].*\\)' ${file}`" ) > /dev/null 2>&1 ; then fixlist="${fixlist} sun_auth_proto" |