diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 966c8cf8d4..15d9c685f1 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-05  Tom Tromey  <tromey@redhat.com>
+
+	* c-exp.y (parse_number): Don't use K&R definition.
+	(yylex): Likewise.
+	(yyerror): Likewise.
+
 2009-06-04  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* varobj.c (varobj_update): Fix out of scope varobjs to not to change.
diff --git a/gdb/c-exp.y b/gdb/c-exp.y
index 688c060ef2..d8b3975259 100644
--- a/gdb/c-exp.y
+++ b/gdb/c-exp.y
@@ -1139,11 +1139,7 @@ name_not_typename :	NAME
 /*** Needs some error checking for the float case ***/
 
 static int
-parse_number (p, len, parsed_float, putithere)
-     char *p;
-     int len;
-     int parsed_float;
-     YYSTYPE *putithere;
+parse_number (char *p, int len, int parsed_float, YYSTYPE *putithere)
 {
   /* FIXME: Shouldn't these be unsigned?  We don't deal with negative values
      here, and we do kind of silly things like cast to unsigned.  */
@@ -1808,7 +1804,7 @@ static int last_was_structop;
 /* Read one token, getting characters through lexptr.  */
 
 static int
-yylex ()
+yylex (void)
 {
   int c;
   int namelen;
@@ -2209,8 +2205,7 @@ c_parse (void)
 
 
 void
-yyerror (msg)
-     char *msg;
+yyerror (char *msg)
 {
   if (prev_lexptr)
     lexptr = prev_lexptr;