diff options
| author | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-06-28 17:52:45 +0000 |
|---|---|---|
| committer | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-06-28 17:52:45 +0000 |
| commit | 78f7fe688e92b7469a743d4e1f291d1fac3ad88b (patch) | |
| tree | d11594c041588d7561ac1b299fddf1d1762b178a /libobjc/encoding.c | |
| parent | 16795cfbe1bc7d296a41609b5470aa14e85a5ce2 (diff) | |
| download | gcc-78f7fe688e92b7469a743d4e1f291d1fac3ad88b.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@83800 138bc75d-0d04-0410-961f-82ee72b054a4
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 248ab10bd9a..dba203204b6 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 |