aboutsummaryrefslogtreecommitdiff
path: root/gcc/objc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/objc')
-rw-r--r--gcc/objc/objc-act.c11
-rw-r--r--gcc/objc/objc-act.h2
2 files changed, 6 insertions, 7 deletions
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index b905035..ad2b69a 100644
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -947,10 +947,9 @@ objc_check_decl (tree decl)
if (TREE_CODE (type) != RECORD_TYPE)
return;
- if (TYPE_NAME (type) && (type = is_class_name (TYPE_NAME (type)))
- && type != constant_string_type)
+ if (TYPE_NAME (type) && (type = is_class_name (TYPE_NAME (type))))
error ("statically allocated instance of Objective-C class `%s'",
- IDENTIFIER_POINTER (type));
+ IDENTIFIER_POINTER (type));
}
/* Implement static typing. At this point, we know we have an interface. */
@@ -6300,7 +6299,7 @@ add_method_to_hash_list (hash *hash_list, tree method)
}
tree
-add_method (tree class, tree method, int is_class)
+objc_add_method (tree class, tree method, int is_class)
{
tree mth;
@@ -7815,8 +7814,8 @@ really_start_method (tree method, tree parmlist)
CLASS_SUPER_NAME (objc_implementation_context));
if (interface)
- add_method (interface, copy_node (method),
- TREE_CODE (method) == CLASS_METHOD_DECL);
+ objc_add_method (interface, copy_node (method),
+ TREE_CODE (method) == CLASS_METHOD_DECL);
}
}
}
diff --git a/gcc/objc/objc-act.h b/gcc/objc/objc-act.h
index 0dade33..abbf656 100644
--- a/gcc/objc/objc-act.h
+++ b/gcc/objc/objc-act.h
@@ -54,7 +54,7 @@ tree is_ivar (tree, tree);
int is_private (tree);
int is_public (tree, tree);
tree add_instance_variable (tree, int, tree, tree, tree);
-tree add_method (tree, tree, int);
+tree objc_add_method (tree, tree, int);
tree get_super_receiver (void);
void objc_clear_super_receiver (void);
tree get_class_ivars_from_name (tree);