From 8df4696de9e739d6b1701127f2ccd2a757cbdba8 Mon Sep 17 00:00:00 2001
From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>
Date: Mon, 9 Aug 1999 23:44:03 +0000
Subject: [PATCH] decl.c: Remove redundant prototype for
 `print_error_function'.

        * decl.c: Remove redundant prototype for `print_error_function'.
        (lang_print_error_function): Constify a char*.

        * lex.c (lang_identify): Likewise.

From-SVN: r28633
---
 gcc/cp/ChangeLog | 7 +++++++
 gcc/cp/decl.c    | 5 ++---
 gcc/cp/lex.c     | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 43a7486625b..683277d9c0f 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+1999-08-09  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+        * decl.c: Remove redundant prototype for `print_error_function'.
+        (lang_print_error_function): Constify a char*.
+
+        * lex.c (lang_identify): Likewise.
+
 1999-08-09  Bernd Schmidt  <bernds@cygnus.co.uk>
 
 	* Makefile.in: Update dependencies.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 4f0369368ec..d976f19e561 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -60,7 +60,6 @@ extern int static_labelno;
 extern tree current_namespace;
 extern tree global_namespace;
 
-extern void (*print_error_function) PROTO((char *));
 extern int (*valid_lang_attribute) PROTO ((tree, tree, tree, tree));
 
 /* Obstack used for remembering local class declarations (like
@@ -169,7 +168,7 @@ static void record_unknown_type PROTO((tree, const char *));
 static int member_function_or_else PROTO((tree, tree, const char *));
 static void bad_specifiers PROTO((tree, const char *, int, int, int, int,
 				  int));
-static void lang_print_error_function PROTO((char *));
+static void lang_print_error_function PROTO((const char *));
 static tree maybe_process_template_type_declaration PROTO((tree, int, struct binding_level*));
 static void check_for_uninitialized_const_var PROTO((tree));
 static unsigned long typename_hash PROTO((hash_table_key));
@@ -6632,7 +6631,7 @@ init_decl_processing ()
 
 static void
 lang_print_error_function (file)
-     char *file;
+     const char *file;
 {
   default_print_error_function (file);
   maybe_print_template_context ();
diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c
index d0c62b4ec87..48a2d9889b3 100644
--- a/gcc/cp/lex.c
+++ b/gcc/cp/lex.c
@@ -423,7 +423,7 @@ lang_finish ()
   if (flag_gnu_xref) GNU_xref_end (errorcount+sorrycount);
 }
 
-char *
+const char *
 lang_identify ()
 {
   return "cplusplus";