diff options
Diffstat (limited to 'libobjc/objc/sarray.h')
| -rw-r--r-- | libobjc/objc/sarray.h | 24 |
1 files changed, 7 insertions, 17 deletions
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 <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 */ |