* diagnostic.c (default_print_error_function): Tweak.

	(report_error_function): Likewise.
	* toplev.h (default_print_error_function): Move to...
	* diagnostic.h: ...here. Add a `diagnostic_context *' parameter.
	* tree.h (print_error_function): Move to...
	* diagnostic.h: ...here. Add a `diagnostic_context *' parameter.

ch/

	* lang.c: #include diagnostic.h
	(chill_print_error_function): Add a dummy `diagnostic_context *'.
	* Makefile.in (lang.o): Depend on diagnostic.h

cp/

	* error.c (lang_print_error_function): Add a `diagnostic_context *'
	parameter. Tweak.

f/

	* Make-lang.in (f/com.o): Depend on diagnostic.h
	* com.c: #include diagnostic.h
	(lang_print_error_function): Take a 'diagnostic_context *'.

java/

	* lang.c: #include diagnostic.h
	(lang_print_error): Add a `diagnostic_context *' parameter.
	(java_dummy_print): Likewise.
	* Make-lang.in (JAVA_LEX_C): Depend on diagnostic.h


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@43638 138bc75d-0d04-0410-961f-82ee72b054a4

3 files changed, 15 insertions, 5 deletions

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 676f7be1d7b..2c5cdd27a1e 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,10 @@
+2001-06-28  Gabriel Dos Reis  <gdr@codesourcery.com>
+
+	* lang.c: #include diagnostic.h
+	(lang_print_error): Add a `diagnostic_context *' parameter.
+	(java_dummy_print): Likewise.
+	* Make-lang.in (JAVA_LEX_C): Depend on diagnostic.h
+
 2001-06-27  Alexandre Petit-Bianco  <apbianco@redhat.com>
 
 	* class.c (set_super_info): Call `set_class_decl_access_flags.'
diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index 0cae9b2312b..87a66387361 100644
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -266,7 +266,7 @@ java/jcf-write.o: java/jcf-write.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h \
 java/jv-scan.o: java/jv-scan.c $(CONFIG_H) $(SYSTEM_H) version.h
 java/jvgenmain.o: java/jvgenmain.c $(CONFIG_H) $(JAVA_TREE_H) $(SYSTEM_H)
 java/lang.o: java/lang.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h input.h \
-  toplev.h $(SYSTEM_H) $(RTL_H) $(EXPR_H)
+  toplev.h $(SYSTEM_H) $(RTL_H) $(EXPR_H) diagnostic.h
 java/mangle.o: java/mangle.c $(CONFIG_H) java/jcf.h $(JAVA_TREE_H) $(SYSTEM_H) \
   toplev.h $(GGC_H)
 java/mangle_name.o: java/mangle_name.c $(CONFIG_H) java/jcf.h $(JAVA_TREE_H) \
diff --git a/gcc/java/lang.c b/gcc/java/lang.c
index 0c0b4d6fdf0..e3567f50e01 100644
--- a/gcc/java/lang.c
+++ b/gcc/java/lang.c
@@ -37,6 +37,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "flags.h"
 #include "xref.h"
 #include "ggc.h"
+#include "diagnostic.h"
 
 struct string_option
 {
@@ -50,8 +51,8 @@ static void java_init_options PARAMS ((void));
 static int java_decode_option PARAMS ((int, char **));
 static void put_decl_string PARAMS ((const char *, int));
 static void put_decl_node PARAMS ((tree));
-static void java_dummy_print PARAMS ((const char *));
-static void lang_print_error PARAMS ((const char *));
+static void java_dummy_print PARAMS ((diagnostic_context *, const char *));
+static void lang_print_error PARAMS ((diagnostic_context *, const char *));
 static int process_option_with_no PARAMS ((char *,
 					   struct string_option *,
 					   int));
@@ -592,7 +593,8 @@ lang_printable_name_wls (decl, v)
    is the value of the hook print_error_function, called from toplev.c. */
 
 static void
-lang_print_error (file)
+lang_print_error (context, file)
+     diagnostic_context *context __attribute__((__unused__));
      const char *file;
 {
   static tree last_error_function_context = NULL_TREE;
@@ -673,7 +675,8 @@ java_init ()
    function prototypes.  */
 
 static void
-java_dummy_print (s)
+java_dummy_print (c, s)
+     diagnostic_context *c __attribute__ ((__unused__));
      const char *s __attribute__ ((__unused__));
 {
 }