cp-tree.h (cp_error): Prototype.

	* cp-tree.h (cp_error): Prototype.
	(cp_error_at): Likewise.
	(cp_warning): Likewise.
	(cp_warning_at): Likewise.
	(cp_pedwarn): Likewise.
	(cp_pedwarn_at): Likewise.
	(cp_compiler_error): Likewise.
	(cp_sprintf): Likewise.
	(cp_enable_warning): Likewise.
	* errfn.c: Remove hack to avoid error-function prototypes when
	including cp-tree.h.

Co-Authored-By: Kaveh R. Ghazi <ghazi@caip.rutgers.edu>

From-SVN: r22308

gcc/cp/ChangeLog

+1998-09-07  Mark Mitchell  <mark@markmitchell.com>
+	    and Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+	
+	* cp-tree.h (cp_error): Prototype.
+	(cp_error_at): Likewise.
+	(cp_warning): Likewise.
+	(cp_warning_at): Likewise.
+	(cp_pedwarn): Likewise.
+	(cp_pedwarn_at): Likewise.
+	(cp_compiler_error): Likewise.
+	(cp_sprintf): Likewise.
+	(cp_enable_warning): Likewise.
+	* errfn.c: Remove hack to avoid error-function prototypes when
+	including cp-tree.h.
+	
 1998-09-06  Mark Mitchell  <mark@markmitchell.com>
 
 	* cp-error.def: New file.

gcc/cp/cp-tree.h

@@ -2640,16 +2640,14 @@ extern tree handle_class_head			PROTO((tree, tree, tree));
 extern tree lookup_arg_dependent                PROTO((tree, tree, tree));
 
 /* in errfn.c */
-#ifndef NO_CP_ERROR_FNS
-extern void cp_error				();
-extern void cp_error_at				();
-extern void cp_warning				();
-extern void cp_warning_at			();
-extern void cp_pedwarn				();
-extern void cp_pedwarn_at			();
-extern void cp_compiler_error			();
-extern void cp_sprintf				();
-#endif
+extern void cp_error				PVPROTO((error_code, ...));
+extern void cp_error_at				PVPROTO((error_code, ...));
+extern void cp_warning				PVPROTO((error_code, ...));
+extern void cp_warning_at			PVPROTO((error_code, ...));
+extern void cp_pedwarn				PVPROTO((error_code, ...));
+extern void cp_pedwarn_at			PVPROTO((error_code, ...));
+extern void cp_compiler_error			PVPROTO((error_code, ...));
+extern void cp_sprintf				PVPROTO((error_code, ...));
 extern void cp_enable_warning                   PROTO((int, int));
 
 /* in error.c */

gcc/cp/errfn.c

@@ -23,9 +23,6 @@ Boston, MA 02111-1307, USA.  */
 #include "system.h"
 #include "tree.h"
 #include "toplev.h"
-/* The declarations of cp_error and such here are incompatible with
-   those in cp-tree.h.  */
-#define NO_CP_ERROR_FNS
 #include "cp-tree.h"
 
 /* cp_printer is the type of a function which converts an argument into