2004-08-12 Ziemowit Laski <zlaski@apple.com>

        * objc/NXConstStr.h: Update copyright date; bracket with
        'extern "C"' for C++ use; make include syntax consistent
        by using <...> instead of "..."; hoist <objc/...> includes
        above the 'extern "C"' block.
        * objc/Object.h: Likewise.
        * objc/Protocol.h: Likewise.
        * objc/encoding.h: Likewise.
        * objc/hash.h: Likewise.
        * objc/runtime.h: Likewise.
        * objc/sarray.h: Likewise.
        * objc/thr.h: Likewise.
        * objc/typedstream.h: Likewise.
        * objc/objc-api.h: Add 'extern "C"' block for C++ use.
        (objc_static_instances): For C++ case, do away with
        zero-sized array.
        (objc_method): Hoist definition to file scope.
        (_objc_load_callback, _objc_object_alloc, class_get_class_method,
        class_get_instance_method, class_create_instance,
        class_get_class_name, class_get_instance_size,
        class_get_meta_class, class_get_super_class, class_get_version,
        class_is_class, class_is_meta_class, class_set_version,
        class_get_gc_object_type, class_ivar_set_gcinvisible,
        get_imp): Rename 'class' parameter to '_class'.
        * objc/objc-list.h: Add 'extern "C"' block for C++ use.
        * objc/objc.h: Update copyright date.
        (arglist_t): Provide a union tag.


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

1 files changed, 7 insertions, 17 deletions

diff --git a/libobjc/objc/sarray.h b/libobjc/objc/sarray.h
index 5956a43071e..59ab6ea1fa2 100644
--- a/libobjc/objc/sarray.h
+++ b/libobjc/objc/sarray.h
@@ -1,5 +1,5 @@
 /* Sparse Arrays for Objective C dispatch tables
-   Copyright (C) 1993, 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1995, 1996, 2004 Free Software Foundation, Inc.
    Contributed by Kresten Krab Thorup.
 
 This file is part of GCC.
@@ -28,6 +28,12 @@ Boston, MA 02111-1307, USA.  */
 #ifndef __sarray_INCLUDE_GNU
 #define __sarray_INCLUDE_GNU
 
+#include <objc/thr.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #define OBJC_SPARSE2		/* 2-level sparse array */
 /* #define OBJC_SPARSE3 */      /* 3-level sparse array */
 
@@ -41,22 +47,11 @@ extern const char* __objc_sparse3_id;
 
 #include <stddef.h>
 
-#include "objc/thr.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 extern int nbuckets;		/* for stats */
 extern int nindices;
 extern int narrays;
 extern int idxsize;
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
 #include <assert.h>
 
 /* An unsigned integer of same size as a pointer */
@@ -151,10 +146,6 @@ struct sarray {
   size_t capacity;
 };
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 struct sarray* sarray_new(int, void* default_element);
 void sarray_free(struct sarray*);
 struct sarray* sarray_lazy_copy(struct sarray*);
@@ -251,5 +242,4 @@ static inline void* sarray_get_safe(struct sarray* array, sidx indx)
 }
 #endif /* __cplusplus */
 
-
 #endif /* __sarray_INCLUDE_GNU */