merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index ad85411a150253e21b8892779c941639931cebd7..4e92371d1c2335649ffe3a7dfe265bb180c15a7a 100644 (file)
--- 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 6e995e4817d8839c6786c3f8efe7ce557ec3dd4f..b3b8c58c517f3ac302d1f0858b9c25146e550f3e 100644 (file)
--- 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