diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 86854043200..501e9263a1e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2000-01-29  Zack Weinberg  <zack@wolery.cumb.org>
+
+	* c-parse.in: Apply Ulrich's changes from c-parse.y.
+	* c-parse.y, objc/objc-parse.y, c-parse.c, objc/objc-parse.c:
+	Regenerate.
+
 2000-01-29  Zack Weinberg  <zack@wolery.cumb.org>
 
 	* cpperror.c (cpp_file_line_for_message): If 'line' is zero,
diff --git a/gcc/c-parse.c b/gcc/c-parse.c
index 1385fcdbf2e..290a79d4ae8 100644
--- a/gcc/c-parse.c
+++ b/gcc/c-parse.c
@@ -1265,7 +1265,7 @@ static const short yycheck[] = {    38,
     51,    52,    53,    54
 };
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/share/bison.simple"
+#line 3 "/usr/share/misc/bison.simple"
 /* This file comes from bison-1.28.  */
 
 /* Skeleton output parser for bison,
@@ -1479,7 +1479,7 @@ __yy_memcpy (char *to, char *from, unsigned int count)
 #endif
 #endif
 
-#line 217 "/usr/share/bison.simple"
+#line 217 "/usr/share/misc/bison.simple"
 
 /* The user can define YYPARSE_PARAM as the name of an argument to be passed
    into yyparse.  The argument should have type void *.
@@ -3826,7 +3826,7 @@ case 407:
     break;}
 }
    /* the action file gets copied in in place of this dollarsign */
-#line 543 "/usr/share/bison.simple"
+#line 543 "/usr/share/misc/bison.simple"
 
   yyvsp -= yylen;
   yyssp -= yylen;
diff --git a/gcc/c-parse.in b/gcc/c-parse.in
index e5f876a3d2f..166768dc29f 100644
--- a/gcc/c-parse.in
+++ b/gcc/c-parse.in
@@ -519,7 +519,7 @@ cast_expr:
 		  tree type = $2;
 		  finish_init ();
 
-		  if (pedantic && ! flag_isoc9x)
+		  if (pedantic && ! flag_isoc99)
 		    pedwarn ("ANSI C forbids constructor expressions");
 		  if (TYPE_NAME (type) != 0)
 		    {
@@ -1403,8 +1403,8 @@ parm_declarator:
 ifc
 	| parm_declarator '[' '*' ']'  %prec '.'
 		{ $$ = build_nt (ARRAY_REF, $1, NULL_TREE);
-		  if (! flag_isoc9x)
-		    error ("`[*]' in parameter declaration only allowed in ISO C 9x");
+		  if (! flag_isoc99)
+		    error ("`[*]' in parameter declaration only allowed in ISO C 99");
 		}
 end ifc
 	| parm_declarator '[' expr ']'  %prec '.'
@@ -1439,8 +1439,8 @@ notype_declarator:
 ifc
 	| notype_declarator '[' '*' ']'  %prec '.'
 		{ $$ = build_nt (ARRAY_REF, $1, NULL_TREE);
-		  if (! flag_isoc9x)
-		    error ("`[*]' in parameter declaration only allowed in ISO C 9x");
+		  if (! flag_isoc99)
+		    error ("`[*]' in parameter declaration only allowed in ISO C 99");
 		}
 end ifc
 	| notype_declarator '[' expr ']'  %prec '.'
@@ -1523,7 +1523,7 @@ maybecomma:
 maybecomma_warn:
 	  /* empty */
 	| ','
-		{ if (pedantic && ! flag_isoc9x)
+		{ if (pedantic && ! flag_isoc99)
 		    pedwarn ("comma at end of enumerator list"); }
 	;
 
diff --git a/gcc/objc/objc-parse.c b/gcc/objc/objc-parse.c
index 18db5a40cd4..7d9ca79668a 100644
--- a/gcc/objc/objc-parse.c
+++ b/gcc/objc/objc-parse.c
@@ -2571,7 +2571,7 @@ case 65:
 		  tree type = yyvsp[-5].ttype;
 		  finish_init ();
 
-		  if (pedantic && ! flag_isoc9x)
+		  if (pedantic && ! flag_isoc99)
 		    pedwarn ("ANSI C forbids constructor expressions");
 		  if (TYPE_NAME (type) != 0)
 		    {
@@ -3542,7 +3542,7 @@ case 267:
     break;}
 case 271:
 #line 1463 "objc-parse.y"
-{ if (pedantic && ! flag_isoc9x)
+{ if (pedantic && ! flag_isoc99)
 		    pedwarn ("comma at end of enumerator list"); ;
     break;}
 case 272:
diff --git a/gcc/objc/objc-parse.y b/gcc/objc/objc-parse.y
index 79361efb515..92b0adcbb34 100644
--- a/gcc/objc/objc-parse.y
+++ b/gcc/objc/objc-parse.y
@@ -500,7 +500,7 @@ cast_expr:
 		  tree type = $2;
 		  finish_init ();
 
-		  if (pedantic && ! flag_isoc9x)
+		  if (pedantic && ! flag_isoc99)
 		    pedwarn ("ANSI C forbids constructor expressions");
 		  if (TYPE_NAME (type) != 0)
 		    {
@@ -1460,7 +1460,7 @@ maybecomma:
 maybecomma_warn:
 	  /* empty */
 	| ','
-		{ if (pedantic && ! flag_isoc9x)
+		{ if (pedantic && ! flag_isoc99)
 		    pedwarn ("comma at end of enumerator list"); }
 	;