diff options
| author | Zack Weinberg <zack@gcc.gnu.org> | 2004-06-28 17:52:45 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2004-06-28 17:52:45 +0000 |
| commit | 0cf614012f7e2077828b85073c44b527d300d916 (patch) | |
| tree | d11594c041588d7561ac1b299fddf1d1762b178a /libiberty | |
| parent | 5cd2906234e13880f9ba8ef10a0a3d3550914e77 (diff) | |
| download | gcc-0cf614012f7e2077828b85073c44b527d300d916.zip gcc-0cf614012f7e2077828b85073c44b527d300d916.tar.gz gcc-0cf614012f7e2077828b85073c44b527d300d916.tar.bz2 | |
cp-demangle.h: Declare cplus_demangle_operators...
libiberty:
* cp-demangle.h: Declare cplus_demangle_operators,
cplus_demangle_builtin_types, cplus_demangle_mangled_name, and
cplus_demangle_type as static if IN_GLIBCPP_V3.
libobjc:
* encoding.c: Rename target_flags with a #define to avoid
conflict with a prior declaration.
From-SVN: r83800
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 8 | ||||
| -rw-r--r-- | libiberty/cp-demangle.h | 20 |
2 files changed, 23 insertions, 5 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 96b111a..6458c2a 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,9 @@ +2004-06-28 Zack Weinberg <zack@codesourcery.com> + + * cp-demangle.h: Declare cplus_demangle_operators, + cplus_demangle_builtin_types, cplus_demangle_mangled_name, and + cplus_demangle_type as static if IN_GLIBCPP_V3. + 2004-06-28 Ian Lance Taylor <ian@wasabisystems.com> PR other/16240 @@ -604,7 +610,7 @@ 2003-08-12 Nathanael Nerode <neroden@gcc.gnu.org> - * cp-demangle.c: Clarify what package(s) this is part of. + * cp-demangle.c: Clarify what package(s) this is part of. 2003-07-05 Danny Smith <dannysmith@users.sourceforge.net> diff --git a/libiberty/cp-demangle.h b/libiberty/cp-demangle.h index eea0868..02e74ec 100644 --- a/libiberty/cp-demangle.h +++ b/libiberty/cp-demangle.h @@ -131,19 +131,31 @@ struct d_info /* Functions and arrays in cp-demangle.c which are referenced by functions in cp-demint.c. */ +#ifdef IN_GLIBCPP_V3 +#define CP_STATIC_IF_GLIBCPP_V3 static +#else +#define CP_STATIC_IF_GLIBCPP_V3 extern +#endif -extern const struct demangle_operator_info cplus_demangle_operators[]; +CP_STATIC_IF_GLIBCPP_V3 +const struct demangle_operator_info cplus_demangle_operators[]; #define D_BUILTIN_TYPE_COUNT (26) -extern const struct demangle_builtin_type_info +CP_STATIC_IF_GLIBCPP_V3 +const struct demangle_builtin_type_info cplus_demangle_builtin_types[D_BUILTIN_TYPE_COUNT]; -extern struct demangle_component * +CP_STATIC_IF_GLIBCPP_V3 +struct demangle_component * cplus_demangle_mangled_name PARAMS ((struct d_info *, int)); -extern struct demangle_component * +CP_STATIC_IF_GLIBCPP_V3 +struct demangle_component * cplus_demangle_type PARAMS ((struct d_info *)); extern void cplus_demangle_init_info PARAMS ((const char *, int, size_t, struct d_info *)); + +/* cp-demangle.c needs to define this a little differently */ +#undef CP_STATIC_IF_GLIBCPP_V3 |