diff options
Diffstat (limited to 'gcc/c-family')
-rw-r--r-- | gcc/c-family/ChangeLog | 10 | ||||
-rw-r--r-- | gcc/c-family/c-common.h | 1 | ||||
-rw-r--r-- | gcc/c-family/stub-objc.c | 5 |
3 files changed, 16 insertions, 0 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index d51728b..a0bcadf 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,13 @@ +2010-09-27 Nicola Pero <nicola.pero@meta-innovation.com> + + Merge from 'apple/trunk' branch on FSF servers. + + 2005-10-04 Fariborz Jahanian <fjahanian@apple.com> + + Radar 4281748 + * c-common.h (objc_check_global_decl): New declaration. + * stub-objc.c (objc_check_global_decl): New stub. + 2010-09-29 Joseph Myers <joseph@codesourcery.com> * c.opt: Don't use VarExists. diff --git a/gcc/c-family/c-common.h b/gcc/c-family/c-common.h index a988404..27a051c 100644 --- a/gcc/c-family/c-common.h +++ b/gcc/c-family/c-common.h @@ -955,6 +955,7 @@ extern void c_parse_error (const char *, enum cpp_ttype, tree, unsigned char); extern tree objc_is_class_name (tree); extern tree objc_is_object_ptr (tree); extern void objc_check_decl (tree); +extern void objc_check_global_decl (tree); extern tree objc_common_type (tree, tree); extern bool objc_compare_types (tree, tree, int, tree); extern bool objc_have_common_type (tree, tree, int, tree); diff --git a/gcc/c-family/stub-objc.c b/gcc/c-family/stub-objc.c index 71a34de..51842eb 100644 --- a/gcc/c-family/stub-objc.c +++ b/gcc/c-family/stub-objc.c @@ -56,6 +56,11 @@ objc_check_decl (tree ARG_UNUSED (decl)) { } +void +objc_check_global_decl (tree ARG_UNUSED (decl)) +{ +} + tree objc_common_type (tree ARG_UNUSED (type1), tree ARG_UNUSED (type2)) { |