aboutsummaryrefslogtreecommitdiff
path: root/libobjc
diff options
context:
space:
mode:
Diffstat (limited to 'libobjc')
-rw-r--r--libobjc/ChangeLog18
-rw-r--r--libobjc/archive.c7
-rw-r--r--libobjc/class.c7
-rw-r--r--libobjc/hash.c7
-rw-r--r--libobjc/init.c7
-rw-r--r--libobjc/misc.c7
-rw-r--r--libobjc/nil_method.c7
-rw-r--r--libobjc/objc-private/runtime.h (renamed from libobjc/objc/runtime.h)21
-rw-r--r--libobjc/objects.c6
-rw-r--r--libobjc/sarray.c7
-rw-r--r--libobjc/selector.c7
-rw-r--r--libobjc/sendmsg.c7
-rw-r--r--libobjc/thr.c6
13 files changed, 92 insertions, 22 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index 431c7fc..784056b 100644
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,5 +1,23 @@
2010-09-11 Nicola Pero <nicola.pero@meta-innovation.com>
+ * objc/runtime.h: Moved to objc-private/runtime.h. Do not include
+ all the objc/*.h files.
+ * objc-private/runtime.h: New file.
+ * archive.c: Include objc-private/runtime.h (and required objc/*.h
+ files) instead of objc/runtime.h.
+ * class.c: Same change.
+ * hash.c: Same change.
+ * init.c: Same change.
+ * misc.c: Same change.
+ * nil_method.c: Same change.
+ * objects.c: Same change.
+ * sarray.c: Same change.
+ * selector.c: Same change.
+ * sendmsg.c: Same change.
+ * thr.c: Same change.
+
+2010-09-11 Nicola Pero <nicola.pero@meta-innovation.com>
+
* objc/deprecated/struct_objc_selector.h: New file. Definition of
'struct objc_selector' and 'sel_eq' moved here.
* objc/deprecated/struct_objc_protocol.h: New file. Definition of
diff --git a/libobjc/archive.c b/libobjc/archive.c
index 6ac25fb..5275c63 100644
--- a/libobjc/archive.c
+++ b/libobjc/archive.c
@@ -23,7 +23,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
#include "tconfig.h"
-#include "objc/runtime.h"
+#include "objc/objc.h"
+#include "objc/objc-api.h"
+#include "objc/thr.h"
+#include "objc/hash.h"
+#include "objc/objc-list.h"
+#include "objc-private/runtime.h"
#include "objc/typedstream.h"
#include "objc/encoding.h"
#include <stdlib.h>
diff --git a/libobjc/class.c b/libobjc/class.c
index 58f2319..f3bb07b 100644
--- a/libobjc/class.c
+++ b/libobjc/class.c
@@ -87,12 +87,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
classes from the table - and the difficult thing with lock-free data
structures is freeing data when is removed from the structures. */
-#include "objc/runtime.h" /* the kitchen sink */
-#include "objc/sarray.h"
-
#include "objc/objc.h"
#include "objc/objc-api.h"
#include "objc/thr.h"
+#include "objc/hash.h"
+#include "objc/objc-list.h"
+#include "objc-private/runtime.h" /* the kitchen sink */
+#include "objc/sarray.h"
/* We use a table which maps a class name to the corresponding class
* pointer. The first part of this file defines this table, and
diff --git a/libobjc/hash.c b/libobjc/hash.c
index 21d9458..69b0b9f 100644
--- a/libobjc/hash.c
+++ b/libobjc/hash.c
@@ -24,9 +24,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#include "assert.h"
+#include "objc/objc.h"
+#include "objc/objc-api.h"
+#include "objc/thr.h"
#include "objc/hash.h"
-
-#include "objc/runtime.h" /* for DEBUG_PRINTF */
+#include "objc/objc-list.h"
+#include "objc-private/runtime.h" /* for DEBUG_PRINTF */
/* These two macros determine when a hash table is full and
by how much it should be expanded respectively.
diff --git a/libobjc/init.c b/libobjc/init.c
index 138f907..ea6ab38 100644
--- a/libobjc/init.c
+++ b/libobjc/init.c
@@ -24,7 +24,12 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#include "objc/runtime.h"
+#include "objc/objc.h"
+#include "objc/objc-api.h"
+#include "objc/thr.h"
+#include "objc/hash.h"
+#include "objc/objc-list.h"
+#include "objc-private/runtime.h"
/* The version number of this runtime. This must match the number
defined in gcc (objc-act.c). */
diff --git a/libobjc/misc.c b/libobjc/misc.c
index ab7f568..987acfc 100644
--- a/libobjc/misc.c
+++ b/libobjc/misc.c
@@ -27,7 +27,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#define __USE_FIXED_PROTOTYPES__
#include <stdlib.h>
-#include "objc/runtime.h"
+#include "objc/objc.h"
+#include "objc/objc-api.h"
+#include "objc/thr.h"
+#include "objc/hash.h"
+#include "objc/objc-list.h"
+#include "objc-private/runtime.h"
/*
** Error handler function
diff --git a/libobjc/nil_method.c b/libobjc/nil_method.c
index f73505c..c58515b 100644
--- a/libobjc/nil_method.c
+++ b/libobjc/nil_method.c
@@ -26,7 +26,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
/* This is the nil method, the function that is called when the receiver
of a method is nil */
-#include "objc/runtime.h"
+#include "objc/objc.h"
+#include "objc/objc-api.h"
+#include "objc/thr.h"
+#include "objc/hash.h"
+#include "objc/objc-list.h"
+#include "objc-private/runtime.h"
/* When the receiver of a method invocation is nil, the runtime
returns nil_method() as the method implementation. This function
diff --git a/libobjc/objc/runtime.h b/libobjc/objc-private/runtime.h
index 190d7ef..c924e4d 100644
--- a/libobjc/objc/runtime.h
+++ b/libobjc/objc-private/runtime.h
@@ -22,6 +22,19 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
+/* You need to include this file after including a number of standard ObjC files.
+
+The original list was:
+
+#include "objc/objc.h"
+#include "objc/objc-api.h"
+#include "objc/thr.h"
+#include "objc/hash.h"
+#include "objc/objc-list.h"
+
+but can almost certainly be shrinked down.
+
+*/
#ifndef __objc_runtime_INCLUDE_GNU
#define __objc_runtime_INCLUDE_GNU
@@ -34,14 +47,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#include <stddef.h> /* so noone else will get system versions */
#include <assert.h>
-#include "objc.h" /* core data types */
-#include "objc-api.h" /* runtime api functions */
-
-#include "thr.h" /* thread and mutex support */
-
-#include "hash.h" /* hash structures */
-#include "objc-list.h" /* linear lists */
-
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
diff --git a/libobjc/objects.c b/libobjc/objects.c
index 36ff867..10ac3a9 100644
--- a/libobjc/objects.c
+++ b/libobjc/objects.c
@@ -25,7 +25,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#include "tconfig.h" /* include defs of bzero for target */
#include "objc/objc.h"
-#include "objc/runtime.h" /* the kitchen sink */
+#include "objc/objc-api.h"
+#include "objc/thr.h"
+#include "objc/hash.h"
+#include "objc/objc-list.h"
+#include "objc-private/runtime.h" /* the kitchen sink */
#if OBJC_WITH_GC
# include <gc.h>
diff --git a/libobjc/sarray.c b/libobjc/sarray.c
index bb80ae0..c4d7fbb 100644
--- a/libobjc/sarray.c
+++ b/libobjc/sarray.c
@@ -24,7 +24,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#include "objc/sarray.h"
-#include "objc/runtime.h"
+#include "objc/objc.h"
+#include "objc/objc-api.h"
+#include "objc/thr.h"
+#include "objc/hash.h"
+#include "objc/objc-list.h"
+#include "objc-private/runtime.h"
#include <stdio.h>
#include "assert.h"
diff --git a/libobjc/selector.c b/libobjc/selector.c
index 226ef7d..1b61141 100644
--- a/libobjc/selector.c
+++ b/libobjc/selector.c
@@ -23,7 +23,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#include "objc/runtime.h"
+#include "objc/objc.h"
+#include "objc/objc-api.h"
+#include "objc/thr.h"
+#include "objc/hash.h"
+#include "objc/objc-list.h"
+#include "objc-private/runtime.h"
#include "objc/sarray.h"
#include "objc/encoding.h"
diff --git a/libobjc/sendmsg.c b/libobjc/sendmsg.c
index 8b18451..5b0d360 100644
--- a/libobjc/sendmsg.c
+++ b/libobjc/sendmsg.c
@@ -31,7 +31,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#include "tconfig.h"
#include "coretypes.h"
#include "tm.h"
-#include "objc/runtime.h"
+#include "objc/objc.h"
+#include "objc/objc-api.h"
+#include "objc/thr.h"
+#include "objc/hash.h"
+#include "objc/objc-list.h"
+#include "objc-private/runtime.h"
#include "objc/sarray.h"
#include "objc/encoding.h"
#include "runtime-info.h"
diff --git a/libobjc/thr.c b/libobjc/thr.c
index 4bdbb5d..b2a896a 100644
--- a/libobjc/thr.c
+++ b/libobjc/thr.c
@@ -36,7 +36,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#include "tm.h"
#include "defaults.h"
#include "objc/thr.h"
-#include "objc/runtime.h"
+#include "objc/objc.h"
+#include "objc/objc-api.h"
+#include "objc/hash.h"
+#include "objc/objc-list.h"
+#include "objc-private/runtime.h"
#include <gthr.h>
#include <stdlib.h>
generated by cgit v1.1 at 2025-06-04 13:26:52 +0000