From: DJ Delorie <dj@redhat.com>
Date: Tue, 4 May 2004 20:06:15 +0000 (+0000)
Subject: merge from gcc
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=619874a6bd0cc10b0562fde77f546c0dd8c99f19;p=binutils-gdb.git

merge from gcc
---

diff --git a/include/ChangeLog b/include/ChangeLog
index ad85411a150..4e92371d1c2 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-04  Andreas Jaeger  <aj@suse.de>
+
+	* demangle.h: Do not use C++ reserved keyword typename as
+	parameter for cplus_demangle_fill_builtin_type.
+
 2004-04-22  Richard Henderson  <rth@redhat.com>
 
 	* hashtab.h (struct htab): Add size_prime_index.
diff --git a/include/demangle.h b/include/demangle.h
index 6e995e4817d..b3b8c58c517 100644
--- a/include/demangle.h
+++ b/include/demangle.h
@@ -458,7 +458,7 @@ cplus_demangle_fill_name PARAMS ((struct demangle_component *fill,
 
 extern int
 cplus_demangle_fill_builtin_type PARAMS ((struct demangle_component *fill,
-					  const char *typename));
+					  const char *type_name));
 
 /* Fill in a DEMANGLE_COMPONENT_OPERATOR, using the name of the
    operator and the number of arguments which it takes (the latter is