diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a98a5fc5e36..cbeb16068b4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,16 @@
+Fri Jan 29 14:36:11 1999  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* collect2.c (error): Fix typo in declaration.
+
+	* cpperror.c (cpp_message): Likewise.
+
+	* cpplib.c (cpp_warning): Likewise.
+
+	* cpplib.h (cpp_notice): Use PVPROTO not VPROTO, also add
+ 	ATTRIBUTE_PRINTF_1.
+
+	* toplev.c (error): Fix typo in declaration.
+
 Fri Jan 29 15:44:13 1999  J"orn Rennecke <amylaar@cygnus.co.uk>
 
 	* loop.c (strength_reduce): Fix HAVE_cc0 handling when scanning
diff --git a/gcc/collect2.c b/gcc/collect2.c
index b6407750f6f..6ec9f311472 100644
--- a/gcc/collect2.c
+++ b/gcc/collect2.c
@@ -476,7 +476,7 @@ void
 error VPROTO((const char * msgid, ...))
 {
 #ifndef ANSI_PROTOTYPES
-  const char * string;
+  const char * msgid;
 #endif
   va_list ap;
  
diff --git a/gcc/cpperror.c b/gcc/cpperror.c
index af7ab8c9a63..174450bceb2 100644
--- a/gcc/cpperror.c
+++ b/gcc/cpperror.c
@@ -129,7 +129,7 @@ cpp_message VPROTO ((cpp_reader *pfile, int is_error, const char *msgid, ...))
 #ifndef ANSI_PROTOTYPES
   cpp_reader *pfile;
   int is_error;
-  const char *msg;
+  const char *msgid;
 #endif
   va_list ap;
   
diff --git a/gcc/cpplib.c b/gcc/cpplib.c
index b1c2f6da523..770956bcb25 100644
--- a/gcc/cpplib.c
+++ b/gcc/cpplib.c
@@ -6277,7 +6277,7 @@ cpp_warning VPROTO ((cpp_reader * pfile, const char *msgid, ...))
 {
 #ifndef ANSI_PROTOTYPES
   cpp_reader *pfile;
-  const char *msg;
+  const char *msgid;
 #endif
   va_list ap;
   
diff --git a/gcc/cpplib.h b/gcc/cpplib.h
index 1b82e182be1..bd041920c69 100644
--- a/gcc/cpplib.h
+++ b/gcc/cpplib.h
@@ -713,7 +713,7 @@ extern void cpp_message PVPROTO ((cpp_reader *, int, const char *, ...))
 extern void cpp_pfatal_with_name PROTO ((cpp_reader *, const char *));
 extern void cpp_file_line_for_message PROTO ((cpp_reader *, char *, int, int));
 extern void cpp_print_containing_files PROTO ((cpp_reader *));
-extern void cpp_notice VPROTO ((const char *msgid, ...));
+extern void cpp_notice PVPROTO ((const char *msgid, ...)) ATTRIBUTE_PRINTF_1;
 
 /* In cppfiles.c */
 extern void append_include_chain	PROTO ((cpp_reader *,
diff --git a/gcc/toplev.c b/gcc/toplev.c
index bee1e8ec894..4ecc9c9b172 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -1852,7 +1852,7 @@ error VPROTO((const char *msgid, ...))
   VA_START (ap, msgid);
 
 #ifndef ANSI_PROTOTYPES
-  msgic = va_arg (ap, const char *);
+  msgid = va_arg (ap, const char *);
 #endif
 
   verror (msgid, ap);