This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: [libobjc] Re: PATCH: objc-improvements-branch merge -- Part 2
"Well, in that case, allow me to retort!"
[libobjc/ChangeLog]
2004-08-13 Ziemowit Laski <zlaski@apple.com>
* objc/sarray.h: Hoist include of assert.h near the top of file,
and mark the remainder of the file 'extern "C"'.
Index: libobjc/objc/sarray.h
===================================================================
RCS file: /cvs/gcc/gcc/libobjc/objc/sarray.h,v
retrieving revision 1.7
diff -u -3 -p -r1.7 sarray.h
--- libobjc/objc/sarray.h 13 Aug 2004 22:23:58 -0000 1.7
+++ libobjc/objc/sarray.h 13 Aug 2004 22:46:55 -0000
@@ -42,6 +42,7 @@ extern const char* __objc_sparse3_id;
#endif
#include <stddef.h>
+#include <assert.h>
#ifdef __cplusplus
extern "C" {
@@ -52,13 +53,6 @@ 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 */
#define SIZET_BITS (sizeof(size_t)*8)
@@ -151,10 +145,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*);
--------------------------------------------------------------
Ziemowit Laski 1 Infinite Loop, MS 301-2K
Mac OS X Compiler Group Cupertino, CA USA 95014-2083
Apple Computer, Inc. +1.408.974.6229 Fax .5477