diff options
| author | nicola <nicola@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-12-19 00:28:52 +0000 |
|---|---|---|
| committer | nicola <nicola@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-12-19 00:28:52 +0000 |
| commit | 46cb54adc79bd9757b0d679ef50cc5246574ecab (patch) | |
| tree | 85fd234005a84442479249a4832907d1ec531fc7 /libobjc | |
| parent | 86559c3b23f548eee93f1ef20d0ff6f840a005a9 (diff) | |
| download | gcc-46cb54adc79bd9757b0d679ef50cc5246574ecab.tar.gz | |
In libobjc/:
2010-12-19 Nicola Pero <nicola.pero@meta-innovation.com>
* init.c: Include objc-private/selector.h. Do not declare
__sel_register_typed_name.
* objc-private/selector.h (__sel_register_typed_name): Declare.
* selector.c: Include objc-private/selector.h.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168039 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libobjc')
| -rw-r--r-- | libobjc/ChangeLog | 7 | ||||
| -rw-r--r-- | libobjc/init.c | 6 | ||||
| -rw-r--r-- | libobjc/objc-private/selector.h | 4 | ||||
| -rw-r--r-- | libobjc/selector.c | 1 |
4 files changed, 13 insertions, 5 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index 793b002c4cf..bef28fb9dc5 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,10 @@ +2010-12-19 Nicola Pero <nicola.pero@meta-innovation.com> + + * init.c: Include objc-private/selector.h. Do not declare + __sel_register_typed_name. + * objc-private/selector.h (__sel_register_typed_name): Declare. + * selector.c: Include objc-private/selector.h. + 2010-12-18 Nicola Pero <nicola.pero@meta-innovation.com> * class.c: Tidied up comments and indentation. No code changes. diff --git a/libobjc/init.c b/libobjc/init.c index ff47f8103f9..370dea9e0f6 100644 --- a/libobjc/init.c +++ b/libobjc/init.c @@ -32,6 +32,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #include "objc-private/objc-list.h" #include "objc-private/module-abi-8.h" #include "objc-private/runtime.h" +#include "objc-private/selector.h" /* For __sel_register_typed_name(). */ #include "objc-private/objc-sync.h" /* For __objc_sync_init() */ #include "objc-private/protocols.h" /* For __objc_protocols_init(), __objc_protocols_add_protocol() @@ -92,11 +93,6 @@ void (*_objc_load_callback) (Class class, struct objc_category *category); /* !T /* Are all categories/classes resolved? */ BOOL __objc_dangling_categories = NO; /* !T:UNUSED */ -/* TODO: This needs to go into objc-private/selector.h. */ -extern SEL -__sel_register_typed_name (const char *name, const char *types, - struct objc_selector *orig, BOOL is_const); - /* Sends +load to all classes and categories in certain situations. */ static void objc_send_load (void); diff --git a/libobjc/objc-private/selector.h b/libobjc/objc-private/selector.h index a0986b52e65..0022895d2e1 100644 --- a/libobjc/objc-private/selector.h +++ b/libobjc/objc-private/selector.h @@ -45,6 +45,10 @@ BOOL sel_is_mapped (SEL aSel); SEL sel_get_any_uid (const char *name); +SEL +__sel_register_typed_name (const char *name, const char *types, + struct objc_selector *orig, BOOL is_const); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/libobjc/selector.c b/libobjc/selector.c index 0e51e31b132..f63ceeb0f98 100644 --- a/libobjc/selector.c +++ b/libobjc/selector.c @@ -30,6 +30,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #include "objc-private/module-abi-8.h" #include "objc-private/runtime.h" #include "objc-private/sarray.h" +#include "objc-private/selector.h" /* Initial selector hash table size. Value doesn't matter much. */ #define SELECTOR_HASH_SIZE 128 |