--- a/src/print.c	Mon Aug 13 08:57:57 2007 +0200
+++ b/src/print.c	Mon Aug 13 08:58:20 2007 +0200
@@ -591,6 +591,7 @@
 }
 
 # include "emacsfns.h"
+static void print_error_message (Lisp_Object data, Lisp_Object stream);
 /* Synched with Emacs 19.34 */
 DEFUN ("error-message-string", Ferror_message_string, 1, 1, 0, /*
 Convert an error value (ERROR-SYMBOL . DATA) to an error message.
@@ -601,7 +602,7 @@
   Lisp_Object original, printcharfun, value;
   struct gcpro gcpro1;
 
-  print_error_message (obj, Vprin1_to_string_buffer, NULL);
+  print_error_message (obj, Vprin1_to_string_buffer);
 
   set_buffer_internal (XBUFFER (Vprin1_to_string_buffer));
   value = Fbuffer_substring (Fpoint_min(Fcurrent_buffer()),
@@ -619,8 +620,8 @@
 /* Print an error message for the error DATA
    onto Lisp output stream STREAM (suitable for the print functions).  */
 
-print_error_message (data, stream)
-     Lisp_Object data, stream;
+static void
+print_error_message (Lisp_Object data, Lisp_Object stream)
 {
   Lisp_Object errname, errmsg, file_error, tail;
   struct gcpro gcpro1;