3 files changed, 13 insertions, 11 deletions
diff --git a/Objective-C/JIGS/ObjcRuntimeUtilities.c b/Objective-C/JIGS/ObjcRuntimeUtilities.c
index 9fbb3fc..f909e0a 100644
--- a/Objective-C/JIGS/ObjcRuntimeUtilities.c
+++ b/Objective-C/JIGS/ObjcRuntimeUtilities.c
@@ -46,6 +46,10 @@
  */
 #define	OBJC_VERSION	8
 
+/* FIXME: This should be something like an #ifndef __NEXT_RUNTIME__, but
+   __NEXT_RUNTIME__ isn't defined in C code. */
+#ifndef __APPLE__
+
 #include "ObjcRuntimeUtilities.h"
 #include <string.h>
 
@@ -213,8 +217,4 @@ void ObjcUtilities_register_method_list (Class class, MethodList *ml)
   objc_mutex_unlock (__objc_runtime_mutex);
 }
 
-
-
-
-
-
+#endif
diff --git a/Objective-C/JIGS/ObjcRuntimeUtilities.h b/Objective-C/JIGS/ObjcRuntimeUtilities.h
index 563a43d..5096293 100644
--- a/Objective-C/JIGS/ObjcRuntimeUtilities.h
+++ b/Objective-C/JIGS/ObjcRuntimeUtilities.h
@@ -23,6 +23,10 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
    */
 
+/* FIXME: This should be something like a simple #ifndef
+   __NEXT_RUNTIME__, but __NEXT_RUNTIME__ isn't defined in C code. */
+#if !defined(__NEXT_RUNTIME__) && !defined(__APPLE__)
+
 #ifndef __ObjcRuntimeUtilities_h_GNUSTEP_JAVA_INCLUDE
 #define __ObjcRuntimeUtilities_h_GNUSTEP_JAVA_INCLUDE
 
@@ -169,3 +173,4 @@ const char *ObjcUtilities_build_runtime_Objc_signature (const char *);
 void ObjcUtilities_register_method_list (Class class, MethodList *ml);
 
 #endif /* __ObjcRuntimeUtilitis_h_GNUSTEP_JAVA_INCLUDE */
+#endif
diff --git a/Objective-C/JIGS/ObjcRuntimeUtilities2.m b/Objective-C/JIGS/ObjcRuntimeUtilities2.m
index 986600a..e457c6e 100644
--- a/Objective-C/JIGS/ObjcRuntimeUtilities2.m
+++ b/Objective-C/JIGS/ObjcRuntimeUtilities2.m
@@ -27,6 +27,8 @@
  * be compiled using the Objective-C compiler.
  */
 
+#ifndef __NEXT_RUNTIME__
+
 #include <Foundation/Foundation.h>
 
 const char *ObjcUtilities_build_runtime_Objc_signature (const char 
@@ -43,9 +45,4 @@ const char *ObjcUtilities_build_runtime_Objc_signature (const char
 #endif  
 }
 
-
-
-
-
-
-
+#endif