From ddf7690398cf9828fb1e30d97e0767f0db4ee44a Mon Sep 17 00:00:00 2001
From: fedor <fedor@72102866-910b-0410-8b05-ffd578937521>
Date: Fri, 1 Mar 2002 04:13:27 +0000
Subject: [PATCH] Darwin link/compile fixes

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@12911 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                            | 9 +++++++++
 Headers/gnustep/base/objc-gnu2next.h | 1 +
 Source/Makefile.preamble             | 2 +-
 Source/NSPortCoder.m                 | 4 ++--
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9b0a05c09..24290e5c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-02-28  Adam Fedor  <fedor@gnu.org>
+
+	* Headers/gnustep/base/objc-gnu2next.h: Add objc-runtime.h
+	* Source/Makefile.preamble: Add ..DEPEND_UPON for all darwin versions.
+
+	* Source/NSPortCoder.m
+	(-initWithReceivePort:sendPort:components:): Change cast to make
+	MacOSX compiler happy.
+
 2002-02-28  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSUser.m: rewrite user and defaults root code to standardise
diff --git a/Headers/gnustep/base/objc-gnu2next.h b/Headers/gnustep/base/objc-gnu2next.h
index a49570233..b1f1da910 100644
--- a/Headers/gnustep/base/objc-gnu2next.h
+++ b/Headers/gnustep/base/objc-gnu2next.h
@@ -29,6 +29,7 @@
 #if NeXT_RUNTIME
 
 #include <objc/objc-class.h>
+#include <objc/objc-runtime.h>
 #include <stddef.h>
 #include <ctype.h>
 #include <stdio.h>
diff --git a/Source/Makefile.preamble b/Source/Makefile.preamble
index 4bec74bc4..6ed31b8ab 100644
--- a/Source/Makefile.preamble
+++ b/Source/Makefile.preamble
@@ -63,7 +63,7 @@ endif
 ifeq ($(GNUSTEP_TARGET_OS),cygwin)
 libgnustep-base_LIBRARIES_DEPEND_UPON += -lobjc
 endif
-ifeq ($(findstring darwin1, $(GNUSTEP_TARGET_OS)), darwin1)
+ifeq ($(findstring darwin, $(GNUSTEP_TARGET_OS)), darwin)
 libgnustep-base_LIBRARIES_DEPEND_UPON += $(CONFIG_SYSTEM_LIBS) \
 	-flat_namespace
 endif
diff --git a/Source/NSPortCoder.m b/Source/NSPortCoder.m
index ba6edab17..689b3ce65 100644
--- a/Source/NSPortCoder.m
+++ b/Source/NSPortCoder.m
@@ -1807,8 +1807,8 @@ static IMP	_xRefImp;	/* Serialize a crossref.	*/
 	      GSIArrayRemoveAllItems(_objAry);
 	      GSIArrayRemoveAllItems(_ptrAry);
 	    }
-	  GSIArrayAddItem(_clsAry, (GSIArrayItem)nil);
-	  GSIArrayAddItem(_objAry, (GSIArrayItem)nil);
+	  GSIArrayAddItem(_clsAry, (GSIArrayItem)(void*)0);
+	  GSIArrayAddItem(_objAry, (GSIArrayItem)(void*)0);
 	  GSIArrayAddItem(_ptrAry, (GSIArrayItem)(void*)0);
 	}
       NS_HANDLER