diff options
author | Nicola Pero <nicola.pero@meta-innovation.com> | 2011-02-23 10:57:59 +0000 |
---|---|---|
committer | Nicola Pero <nicola@gcc.gnu.org> | 2011-02-23 10:57:59 +0000 |
commit | 79d822528c732a292ec9974a2ffacdb0dc6db79f (patch) | |
tree | 00d37a8caa57c4cada7e20a68cfc6490ccfee7c6 /gcc/objc/objc-act.h | |
parent | 21e1e594a965e3742aca387b0f76e4bcbb19c64c (diff) | |
download | gcc-79d822528c732a292ec9974a2ffacdb0dc6db79f.zip gcc-79d822528c732a292ec9974a2ffacdb0dc6db79f.tar.gz gcc-79d822528c732a292ec9974a2ffacdb0dc6db79f.tar.bz2 |
Removed conflict in usage of TYPE_LANG_SLOT_0 between Objective-C and C
From-SVN: r170436
Diffstat (limited to 'gcc/objc/objc-act.h')
-rw-r--r-- | gcc/objc/objc-act.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gcc/objc/objc-act.h b/gcc/objc/objc-act.h index 54f067f..3983d4b 100644 --- a/gcc/objc/objc-act.h +++ b/gcc/objc/objc-act.h @@ -164,9 +164,7 @@ typedef enum objc_property_assign_semantics { #define CLASS_CATEGORY_LIST(CLASS) TREE_VEC_ELT (TYPE_LANG_SLOT_1 (CLASS), 3) #define CLASS_PROTOCOL_LIST(CLASS) TREE_VEC_ELT (TYPE_LANG_SLOT_1 (CLASS), 4) #define TOTAL_CLASS_RAW_IVARS(CLASS) TREE_VEC_ELT (TYPE_LANG_SLOT_1 (CLASS), 5) - -/* FIXME */ -#define CLASS_HAS_EXCEPTION_ATTR(CLASS) ((CLASS)->type.lang_flag_0) +#define CLASS_HAS_EXCEPTION_ATTR(CLASS) (TYPE_LANG_FLAG_0 (CLASS)) #define PROTOCOL_NAME(CLASS) ((CLASS)->type.name) #define PROTOCOL_LIST(CLASS) TREE_VEC_ELT (TYPE_LANG_SLOT_1 (CLASS), 0) |