In libobjc/: 2010-12-19 Nicola Pero <nicola.pero@meta-innovation.com>

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.

From-SVN: r168039

diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index 793b002c4cf85b37bb8f64007f97d2e089016ab2..bef28fb9dc5548afcde1764eb42acd0e55c4d46a 100644 (file)
--- 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 ff47f8103f9b9dc8e098a30d6af97d2e1c17c4cf..370dea9e0f64958be4c56609674b716e7fce26b6 100644 (file)
--- 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 a0986b52e655abde85a8463c1f273145b8339352..0022895d2e1e0050e312a0cd77e5ad1691bf2507 100644 (file)
--- 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 0e51e31b132e1cb3fa24f166072f96c82afb39db..f63ceeb0f98d2330612d052304f653be7a939a94 100644 (file)
--- 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