--- gcc/cp/errfn.c	2018/04/24 18:20:22	1.1.1.1
+++ gcc/cp/errfn.c	2018/04/24 18:43:31	1.1.1.3
@@ -1,5 +1,5 @@
 /* Provide a call-back mechanism for handling error output.
-   Copyright (C) 1993 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc.
    Contributed by Jason Merrill (jason@cygnus.com)
 
    This file is part of GNU CC.
@@ -16,10 +16,12 @@ GNU General Public License for more deta
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+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
@@ -42,11 +44,11 @@ extern int   cp_line_of PROTO((tree));
 
 #define STRDUP(f) (ap = (char *) alloca (strlen (f) +1), strcpy (ap, (f)), ap)
 
-#define NARGS 3
-#define arglist a1, a2, a3
-#define arglist_dcl HOST_WIDE_INT a1, a2, a3;
-#define ARGSINIT args[0] = a1; args[1] = a2; args[2] = a3;
-#define ARGSLIST args[0], args[1], args[2]
+#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]
 
 static void
 cp_thing (errfn, atarg1, format, arglist)
@@ -194,8 +196,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