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 /libobjc/encoding.c | |
| 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 'libobjc/encoding.c')
| -rw-r--r-- | libobjc/encoding.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libobjc/encoding.c b/libobjc/encoding.c index 248ab10b..dba2032 100644 --- a/libobjc/encoding.c +++ b/libobjc/encoding.c @@ -86,8 +86,11 @@ Boston, MA 02111-1307, USA. */ #define STRUCTURE_SIZE_BOUNDARY (BITS_PER_UNIT * sizeof (struct{char a;})) /* Some ROUND_TYPE_ALIGN macros use TARGET_foo, and consequently - target_flags. Define a dummy entry here to so we don't die. */ -static int __attribute__ ((__unused__)) target_flags = 0; + target_flags. Define a dummy entry here to so we don't die. + We have to rename it because target_flags may already have been + declared extern. */ +#define target_flags not_target_flags +static int __attribute__ ((__unused__)) not_target_flags = 0; /* FIXME: while this file has no business including tm.h, this |