diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 3a489b4..422203c 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-04  Joseph S. Myers  <joseph@codesourcery.com>
+
+	* include/cpplib.h (struct cpp_callbacks): Make error take
+	va_list* parameter.
+	* errors.c (cpp_error): Update call to callback.
+
 2005-11-03  Andrew Pinski  <pinskia@physics.uc.edu>
 
 	PR preprocessor/22042
diff --git a/libcpp/errors.c b/libcpp/errors.c
index 554d9e3..97de490 100644
--- a/libcpp/errors.c
+++ b/libcpp/errors.c
@@ -141,7 +141,7 @@
   va_start (ap, msgid);
 
   if (CPP_OPTION (pfile, client_diagnostic))
-    pfile->cb.error (pfile, level, _(msgid), ap);
+    pfile->cb.error (pfile, level, _(msgid), &ap);
   else
     {
       if (CPP_OPTION (pfile, traditional))
diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h
index c5d8e85..adae96b 100644
--- a/libcpp/include/cpplib.h
+++ b/libcpp/include/cpplib.h
@@ -473,7 +473,7 @@
 
   /* Called to emit a diagnostic if client_diagnostic option is true.
      This callback receives the translated message.  */
-  void (*error) (cpp_reader *, int, const char *, va_list)
+  void (*error) (cpp_reader *, int, const char *, va_list *)
        ATTRIBUTE_PRINTF(3,0);
 };