In libobjc/:

2010-12-22  Nicola Pero  <nicola.pero@meta-innovation.com>

	* objc-private/accessors.h: Removed 'extern "C"' guards.  This
	file is never compiled with C++.
	* objc-private/hash.h: Same change.
	* objc-private/objc-list.h: Same change.
	* objc-private/objc-sync.h: Same change.
	* objc-private/protocols.h: Same change.
	* objc-private/runtime.h: Same change.
	* objc-private/sarray.h: Same change.
	* objc-private/selector.h: Same change.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168149 138bc75d-0d04-0410-961f-82ee72b054a4

9 files changed, 14 insertions, 68 deletions

diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index dbed4fd1cc8..9f37dafc6c2 100644
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-22  Nicola Pero  <nicola.pero@meta-innovation.com>
+
+	* objc-private/accessors.h: Removed 'extern "C"' guards.  This
+	file is never compiled with C++.
+	* objc-private/hash.h: Same change.
+	* objc-private/objc-list.h: Same change.
+	* objc-private/objc-sync.h: Same change.
+	* objc-private/protocols.h: Same change.
+	* objc-private/runtime.h: Same change.
+	* objc-private/sarray.h: Same change.
+	* objc-private/selector.h: Same change.
+
 2010-12-21  Nicola Pero  <nicola.pero@meta-innovation.com>
 
 	PR libobjc/18764
diff --git a/libobjc/objc-private/accessors.h b/libobjc/objc-private/accessors.h
index a7bcca22649..570ae7a8555 100644
--- a/libobjc/objc-private/accessors.h
+++ b/libobjc/objc-private/accessors.h
@@ -25,16 +25,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #ifndef __objc_private_accessors_INCLUDE_GNU
 #define __objc_private_accessors_INCLUDE_GNU
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 /* This function needs to be called at startup by init.c.  */
 void
 __objc_accessors_init (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #endif /* not __objc_private_accessors_INCLUDE_GNU */
diff --git a/libobjc/objc-private/hash.h b/libobjc/objc-private/hash.h
index ba4c4943438..c330d618e51 100644
--- a/libobjc/objc-private/hash.h
+++ b/libobjc/objc-private/hash.h
@@ -30,10 +30,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #include <stddef.h>
 #include <string.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 /*
  * This data structure is used to hold items
  *  stored in a hash table.  Each node holds 
@@ -202,10 +198,4 @@ objc_compare_strings (const void *k1, const void *k2)
     return ! strcmp ((const char *) k1, (const char *) k2);
 }
 
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
 #endif /* not __hash_INCLUDE_GNU */
diff --git a/libobjc/objc-private/objc-list.h b/libobjc/objc-private/objc-list.h
index b78f4c1347f..523919cc9c4 100644
--- a/libobjc/objc-private/objc-list.h
+++ b/libobjc/objc-private/objc-list.h
@@ -27,10 +27,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #ifndef __GNU_OBJC_LIST_H
 #define __GNU_OBJC_LIST_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 struct objc_list {
   void *head;
   struct objc_list *tail;
@@ -92,8 +88,4 @@ list_free(struct objc_list* list)
     }
 }
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #endif /* not __GNU_OBJC_LIST_H */
diff --git a/libobjc/objc-private/objc-sync.h b/libobjc/objc-private/objc-sync.h
index e69d756d3ad..95eb28b30ed 100644
--- a/libobjc/objc-private/objc-sync.h
+++ b/libobjc/objc-private/objc-sync.h
@@ -25,17 +25,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #ifndef __objc_private_objc_sync_INCLUDE_GNU
 #define __objc_private_objc_sync_INCLUDE_GNU
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 /* This function needs to be called at startup before @synchronized()
    can be used.  */
 void
 __objc_sync_init (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #endif /* not __objc_private_objc_sync_INCLUDE_GNU */
diff --git a/libobjc/objc-private/protocols.h b/libobjc/objc-private/protocols.h
index 49a2d92648f..87f8fc8487c 100644
--- a/libobjc/objc-private/protocols.h
+++ b/libobjc/objc-private/protocols.h
@@ -25,10 +25,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #ifndef __objc_private_protocols_INCLUDE_GNU
 #define __objc_private_protocols_INCLUDE_GNU
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 /* This function needs to be called at startup by init.c.  */
 void
 __objc_protocols_init (void);
@@ -39,8 +35,4 @@ __objc_protocols_init (void);
 void
 __objc_protocols_add_protocol (const char *name, Protocol *object);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #endif /* not __objc_private_protocols_INCLUDE_GNU */
diff --git a/libobjc/objc-private/runtime.h b/libobjc/objc-private/runtime.h
index 2c34add9064..f4ad2e7178e 100644
--- a/libobjc/objc-private/runtime.h
+++ b/libobjc/objc-private/runtime.h
@@ -48,10 +48,6 @@ objc/runtime.h.  */
 #include <stddef.h>		/* so noone else will get system versions */
 #include <assert.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 extern BOOL __objc_add_class_to_hash (Class);   /* (objc-class.c) */
 extern void __objc_init_class_tables (void);    /* (objc-class.c) */
 extern void __objc_init_dispatch_tables (void); /* (objc-dispatch.c) */
@@ -65,8 +61,8 @@ extern void __objc_init_class (Class class);  /* init.c */
 extern void class_add_method_list (Class, struct objc_method_list *);
 
 /* Registering instance methods as class methods for root classes */
-extern void __objc_register_instance_methods_to_class(Class);
-extern struct objc_method * search_for_method_in_list(struct objc_method_list * list, SEL op);
+extern void __objc_register_instance_methods_to_class (Class);
+extern struct objc_method * search_for_method_in_list (struct objc_method_list * list, SEL op);
 
 extern void
 __objc_update_classes_with_methods (struct objc_method *method_a, struct objc_method *method_b); /* class.c */
@@ -80,8 +76,4 @@ extern int __objc_runtime_threads_alive;
 BOOL __objc_responds_to (id object, SEL sel); /* for internal use only! */
 extern void __objc_generate_gc_type_description (Class);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #endif /* not __objc_private_runtime_INCLUDE_GNU */
diff --git a/libobjc/objc-private/sarray.h b/libobjc/objc-private/sarray.h
index f81b08e71e7..4d27fade609 100644
--- a/libobjc/objc-private/sarray.h
+++ b/libobjc/objc-private/sarray.h
@@ -39,10 +39,6 @@ extern const char* __objc_sparse3_id;
 
 #include <stddef.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 extern int nbuckets;		/* for stats */
 extern int nindices;
 extern int narrays;
@@ -232,8 +228,4 @@ static inline void* sarray_get_safe(struct sarray* array, sidx indx)
     return (array->empty_bucket->elems[0]);
 }
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #endif /* __sarray_INCLUDE_GNU */
diff --git a/libobjc/objc-private/selector.h b/libobjc/objc-private/selector.h
index 39fa6b6897a..490e17105a5 100644
--- a/libobjc/objc-private/selector.h
+++ b/libobjc/objc-private/selector.h
@@ -25,10 +25,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #ifndef __objc_private_selector_INCLUDE_GNU
 #define __objc_private_selector_INCLUDE_GNU
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 /* Private runtime functions that may go away or be rewritten or
    replaced.  */
 
@@ -58,8 +54,4 @@ BOOL sel_is_mapped (SEL aSel);
 SEL
 sel_get_any_uid (const char *name);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #endif /* not __objc_private_selector_INCLUDE_GNU */