From 619874a6bd0cc10b0562fde77f546c0dd8c99f19 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Tue, 4 May 2004 20:06:15 +0000 Subject: merge from gcc --- include/ChangeLog | 5 +++++ include/demangle.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/ChangeLog b/include/ChangeLog index ad85411..4e92371 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2004-05-04 Andreas Jaeger + + * demangle.h: Do not use C++ reserved keyword typename as + parameter for cplus_demangle_fill_builtin_type. + 2004-04-22 Richard Henderson * hashtab.h (struct htab): Add size_prime_index. diff --git a/include/demangle.h b/include/demangle.h index 6e995e4..b3b8c58 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 -- cgit v1.1