inclhack.def (endif_label): Add additional selector for more bogus stuff after #endif statements.

        * fixinc/inclhack.def (endif_label): Add additional selector for
        more bogus stuff after #endif statements.
        * fixinc/inclhack.sh, fixinc/fixincl.x: Rebuilt.

From-SVN: r27486

gcc/ChangeLog

+Fri Jun 11 03:17:51 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* fixinc/inclhack.def (endif_label): Add additional selector for
+	more bogus stuff after #endif statements.
+	* fixinc/inclhack.sh, fixinc/fixincl.x: Rebuilt.
+
 Thu Jun 10 20:44:36 1999  Mumit Khan  <khan@xraylith.wisc.edu>
 
 	* i386/cygwin.h (SET_ASM_OP): Define.

gcc/fixinc/fixincl.x

@@ -742,7 +742,7 @@ tSCC zEndif_LabelName[] =
  *  content selection pattern - do fix if pattern found
  */
 tSCC zEndif_LabelSelect0[] =
-       "^[ \t]*#[ \t]*endif[ \t]+[!-.0-z{|}~]";
+       "^[ \t]*#[ \t]*endif[ \t]+[!-.0-z{|}~]|^[ \t]*#[ \t]*endif[ \t]+/[^*]";
 
 #define    ENDIF_LABEL_TEST_CT  1
 #define    ENDIF_LABEL_RE_CT    1

gcc/fixinc/inclhack.def

@@ -421,13 +421,19 @@ fix = {
      *  match '#endif / * foo * /', but it also wont match
      *  '#endif / done' either.
      *
+     *  We have a second regexp in the selector to detect
+     *  #endif followed by a / followed by anything other
+     *  than a *.  For example "#endif / * foo * /" or 
+     *  "#endif /% blah %/ which appear on OSF4.0A and AIX4.2
+     *  repsectively.
+     * 
      *  We use the pattern [!-.0-z{|}~] instead of [^/ \t] to match a noncomment
      *  following #else or #endif because some buggy egreps think [^/] matches
      *  newline, and they thus think `#else ' matches
      *  `#e[ndiflse]*[ \t]+[^/ \t]'.
      *  [!-.0-~] does not work properly on AIX 4.1.
      */
-    select   = "^[ \t]*#[ \t]*endif[ \t]+[!-.0-z\{\|\}\~]";
+    select   = "^[ \t]*#[ \t]*endif[ \t]+[!-.0-z\{\|\}\~]|^[ \t]*#[ \t]*endif[ \t]+/[^\*]";
 
     /*
      *  First, join the continued input lines.

gcc/fixinc/inclhack.sh

@@ -841,7 +841,7 @@ s%^\([ 	]*#[ 	]*else\)[ 	]*[^/ 	].*%\1%' \
     #
     # Fix  21:  Endif_Label
     #
-    if ( test -n "`egrep '^[ 	]*#[ 	]*endif[ 	]+[!-.0-z{|}~]' ${file}`"
+    if ( test -n "`egrep '^[ 	]*#[ 	]*endif[ 	]+[!-.0-z{|}~]|^[ 	]*#[ 	]*endif[ 	]+/[^*]' ${file}`"
        ) > /dev/null 2>&1 ; then
     fixlist="${fixlist}
       endif_label"