From 1a6213c3deb341d45d9ad004a485deea000ff476 Mon Sep 17 00:00:00 2001 From: Ziemowit Laski Date: Fri, 13 Aug 2004 02:06:37 +0000 Subject: NXConstStr.h: Update copyright date... 2004-08-12 Ziemowit Laski * objc/NXConstStr.h: Update copyright date; bracket with 'extern "C"' for C++ use; make include syntax consistent by using <...> instead of "..."; hoist 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. From-SVN: r85927 --- libobjc/objc/sarray.h | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) (limited to 'libobjc/objc/sarray.h') diff --git a/libobjc/objc/sarray.h b/libobjc/objc/sarray.h index 5956a43..59ab6ea 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 + +#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 -#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 /* 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 */ -- cgit v1.1