Updated to use IN_OBJC

From-SVN: r4232

diff --git a/gcc/objc/runtime.h b/gcc/objc/runtime.h
index e37fb56ef626f7d3ffe036369073e17e54e14982..1d9924f58705b010441cc837f9b3d564dbb818a6 100644 (file)
--- a/gcc/objc/runtime.h
+++ b/gcc/objc/runtime.h
@@ -27,6 +27,8 @@ You should have received a copy of the GNU General Public License along with
 #ifndef __objc_runtime_INCLUDE_GNU
 #define __objc_runtime_INCLUDE_GNU
 
+#include <stdio.h>             /* argh! I hate this */
+
 #include "gstdarg.h"           /* for varargs and va_list's */
 #include "gstddef.h"           /* so noone else will get system versions */
 #include "assert.h"
@@ -37,8 +39,6 @@ You should have received a copy of the GNU General Public License along with
 #include "objc/hash.h"         /* hash structures */
 #include "objc/list.h"         /* linear lists */
 
-#include <stdio.h>             /* argh! I hate this */
-
 extern void __objc_add_class_to_hash(Class_t); /* (objc-class.c) */
 extern void __objc_init_selector_tables();     /* (objc-sel.c) */
 extern void __objc_init_class_tables();     /* (objc-class.c) */

diff --git a/gcc/objc/sarray.h b/gcc/objc/sarray.h
index 7706ceb0467123f63c1e83e3272cd347c9c9bd72..6d405001ae8b27b4328a3a90afc044b7f048dab5 100644 (file)
--- a/gcc/objc/sarray.h
+++ b/gcc/objc/sarray.h
@@ -39,7 +39,11 @@ extern const char* __objc_sparse2_id;
 extern const char* __objc_sparse3_id;
 #endif
 
+#ifdef IN_OBJC
+#include "gstddef.h"
+#else
 #include <stddef.h>
+#endif
 
 extern int nbuckets;           /* for stats */
 extern int nindices;