92th Cygnus<->FSF quick merge

[pf3gnuchains/gcc-fork.git] / gcc / cp / errfn.c

diff --git a/gcc/cp/errfn.c b/gcc/cp/errfn.c
index f36b0e1..b5ab8f7 100644 (file)
--- a/gcc/cp/errfn.c
+++ b/gcc/cp/errfn.c
@@ -21,6 +21,7 @@ Boston, MA 02111-1307, USA.  */
    
 #include "config.h"
 #include "tree.h"
+#include <stdio.h>
 #include <ctype.h>
 
 /* cp_printer is the type of a function which converts an argument into
@@ -43,11 +44,12 @@ extern int   cp_line_of PROTO((tree));
 
 #define STRDUP(f) (ap = (char *) alloca (strlen (f) +1), strcpy (ap, (f)), ap)
 
-#define NARGS 4
-#define arglist a1, a2, a3, a4
-#define arglist_dcl HOST_WIDE_INT a1, a2, a3, a4;
-#define ARGSINIT args[0] = a1; args[1] = a2; args[2] = a3; args[3] = a4;
-#define ARGSLIST args[0], args[1], args[2], args[3]
+#define NARGS 5
+#define arglist a1, a2, a3, a4, a5
+#define arglist_dcl HOST_WIDE_INT a1, a2, a3, a4, a5;
+#define ARGSINIT \
+  args[0] = a1; args[1] = a2; args[2] = a3; args[3] = a4; args[4] = a5;
+#define ARGSLIST args[0], args[1], args[2], args[3], args[4]
 
 static void
 cp_thing (errfn, atarg1, format, arglist)
@@ -195,8 +197,7 @@ cp_sprintf (format, arglist)
      char *format;
      arglist_dcl
 {
-  extern errorfn sprintf;
-  cp_thing (sprintf, 0, format, arglist);
+  cp_thing ((errorfn *) sprintf, 0, format, arglist);
 }
 
 void