From bf317e4b797d7e08e5f6a3c932563605ad630e33 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Tue, 5 Feb 2002 17:53:03 +0000 Subject: merge from gcc --- include/ChangeLog | 7 +++++++ include/demangle.h | 9 +++------ 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/ChangeLog b/include/ChangeLog index 59561b8a6..9ac65a039 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,10 @@ +2002-02-05 Jason Merrill + + * demangle.h (cplus_demangle_v3): Add "options" parm. + (cplus_demangle_v3_type): Remove prototype. + (DMGL_VERBOSE): New macro. + (DMGL_TYPES): New macro. + 2002-02-02 H.J. Lu (hjl@gnu.org) * demangle.h (cplus_demangle_v3_type): New prototype. diff --git a/include/demangle.h b/include/demangle.h index cbe280413..ad0569a0d 100644 --- a/include/demangle.h +++ b/include/demangle.h @@ -29,6 +29,8 @@ #define DMGL_PARAMS (1 << 0) /* Include function args */ #define DMGL_ANSI (1 << 1) /* Include const, volatile, etc */ #define DMGL_JAVA (1 << 2) /* Demangle as Java rather than C++. */ +#define DMGL_VERBOSE (1 << 3) /* Include implementation details. */ +#define DMGL_TYPES (1 << 4) /* Also try to demangle type encodings. */ #define DMGL_AUTO (1 << 8) #define DMGL_GNU (1 << 9) @@ -125,12 +127,7 @@ cplus_demangle_name_to_style PARAMS ((const char *name)); /* V3 ABI demangling entry points, defined in cp-demangle.c. */ extern char* -cplus_demangle_v3 PARAMS ((const char* mangled)); - -/* V3 ABI demangling entry points, defined in cp-demangle.c. Also - demagle types. */ -extern char* -cplus_demangle_v3_type PARAMS ((const char* mangled)); +cplus_demangle_v3 PARAMS ((const char* mangled, int options)); extern char* java_demangle_v3 PARAMS ((const char* mangled)); -- cgit v1.2.3