From 7cde58555127f31ba0a5b2a222c81d160e7168e9 Mon Sep 17 00:00:00 2001
From: zlaski <zlaski@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 13 Aug 2004 22:50:09 +0000
Subject: [PATCH] [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"'.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@85971 138bc75d-0d04-0410-961f-82ee72b054a4
---
libobjc/ChangeLog | 5 +++++
libobjc/objc/sarray.h | 12 +-----------
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index c549a2c33333..89fd88d7d325 100644
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,3 +1,8 @@
+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"'.
+
2004-08-13 Andrew Pinski <pinskia@physics.uc.edu>
* objc/Object.h: Move includes out of extern "C" blocks.
diff --git a/libobjc/objc/sarray.h b/libobjc/objc/sarray.h
index 535c6cc5222c..4965839b3a77 100644
--- a/libobjc/objc/sarray.h
+++ b/libobjc/objc/sarray.h
@@ -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*);
--
GitLab