build additions with NO_GNUSTEP=1

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29771 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,21 @@
+2010-02-26 Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSNetServices.m:
+	* Source/NSURLHandle.m:
+	* Source/NSMethodSignature.m:
+	* Source/NSInvocation.m:
+	* Source/NSURL.m:
+	* Source/Additions/Makefile.preamble:
+	* Source/Additions/NSObject+GNUstepBase.m:
+	* Source/Additions/GSFunctions.m:
+	* Source/Additions/NSAttributedString+GNUstepBase.m:
+	* Source/Additions/GSInsensitiveDictionary.m:
+	* Source/NSConnection.m:
+	* Source/NSLock.m:
+	* Headers/Additions/GNUstepBase/GSObjCRuntime.h:
+	Alterations to build additions with NO_GNUSTEP defined ... after all,
+	they should be able to build like that on OSX with the Apple Foundation.
+
 2010-02-25 Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSIndexPath.m:

Headers/Additions/GNUstepBase/GSObjCRuntime.h

@@ -150,8 +150,6 @@ extern "C" {
 
 #endif
 
-
-#if	!NO_GNUSTEP
 /*
  * Functions for accessing instance variables directly -
  * We can copy an ivar into arbitrary data,
@@ -745,8 +743,6 @@ GSLastErrorStr(long error_id) GS_ATTRIB_DEPRECATED;
 })
 
 
-#endif /* NO_GNUSTEP */
-
 #ifdef __cplusplus
 }
 #endif

Source/Additions/GSFunctions.m

@@ -29,6 +29,7 @@
 #import "common.h"
 #import "GNUstepBase/preface.h"
 #import "GNUstepBase/GSFunctions.h"
+#import "GNUstepBase/NSDebug+GNUstepBase.h"
 #ifndef NeXT_Foundation_LIBRARY
 #import "Foundation/NSArray.h"
 #import "Foundation/NSEnumerator.h"

Source/Additions/GSInsensitiveDictionary.m

@@ -33,6 +33,7 @@
 #import "Foundation/NSKeyedArchiver.h"
 
 #import "GNUstepBase/GSObjCRuntime.h"
+#import "GNUstepBase/NSDebug+GNUstepBase.h"
 
 
 /*

Source/Additions/Makefile.preamble

@@ -39,7 +39,7 @@
 #
 
 # Additional flags to pass to the preprocessor
-ADDITIONAL_CPPFLAGS = $(DEFS) $(CONFIG_SYSTEM_DEFS) -Wall
+ADDITIONAL_CPPFLAGS = $(DEFS) $(CONFIG_SYSTEM_DEFS) -Wall -DNO_GNUSTEP=1
 
 # Additional flags to pass to the Objective-C compiler
 #ADDITIONAL_OBJCFLAGS = 

Source/Additions/NSAttributedString+GNUstepBase.m

@@ -25,6 +25,7 @@
 #import "common.h"
 #import "Foundation/NSException.h"
 #import "GNUstepBase/NSAttributedString+GNUstepBase.h"
+#import "GNUstepBase/NSDebug+GNUstepBase.h"
 
 @implementation	NSAttributedString (GNUstepBase)
 - (NSAttributedString*) attributedSubstringWithRange: (NSRange)aRange

Source/Additions/NSObject+GNUstepBase.m

@@ -25,6 +25,7 @@
 #import "common.h"
 #import "Foundation/NSException.h"
 #import "GNUstepBase/NSObject+GNUstepBase.h"
+#import "GNUstepBase/NSDebug+GNUstepBase.h"
 
 /**
  * Extension methods for the NSObject class

Source/NSConnection.m

@@ -1278,7 +1278,7 @@ static NSLock	*cached_proxies_gate = nil;
    */
   [self setRequestMode: nil];
 
-  IF_NO_GC([self retain];)
+  IF_NO_GC(RETAIN(self);)
 
   if (debug_connection)
     {
@@ -1373,7 +1373,7 @@ static NSLock	*cached_proxies_gate = nil;
       [[IsendPort conversation: IreceivePort] invalidate];
     }
 
-  DESTROY(self);
+  RELEASE(self);
 }
 
 /**

Source/NSInvocation.m

@@ -711,7 +711,7 @@ _arg_addr(NSInvocation *inv, int index)
   NSZoneFree(NSDefaultMallocZone(), (void*)types);
 
   DESTROY(self);
-  self  = RETAIN([NSInvocation invocationWithMethodSignature: newSig]);
+  self = RETAIN([NSInvocation invocationWithMethodSignature: newSig]);
 
   [aCoder decodeValueOfObjCType: @encode(id) at: &_target];
 

Source/NSLock.m

@@ -202,7 +202,6 @@ MFINALIZE
       if (0 != pthread_mutex_init(&_mutex, &attr_reporting))
 	{
 	  DESTROY(self);
-	  self = nil;
 	}
     }
   return self;
@@ -251,7 +250,6 @@ MFINALIZE
       if (0 != pthread_mutex_init(&_mutex, &attr_recursive))
 	{
 	  DESTROY(self);
-	  self = nil;
 	}
     }
   return self;
@@ -287,20 +285,17 @@ MDESCRIPTION
 
 - (id) init
 {
-  if (nil == (self = [super init]))
+  if (nil != (self = [super init]))
     {
-      return nil;
-    }
-  if (0 != pthread_cond_init(&_condition, NULL))
-    {
-      DESTROY(self);
-      return nil;
-    }
-  if (0 != pthread_mutex_init(&_mutex, &attr_reporting))
-    {
-      pthread_cond_destroy(&_condition);
-      DESTROY(self);
-      return nil;
+      if (0 != pthread_cond_init(&_condition, NULL))
+	{
+	  DESTROY(self);
+	}
+      else if (0 != pthread_mutex_init(&_mutex, &attr_reporting))
+	{
+	  pthread_cond_destroy(&_condition);
+	  DESTROY(self);
+	}
     }
   return self;
 }
@@ -377,16 +372,17 @@ MUNLOCK
 
 - (id) initWithCondition: (NSInteger)value
 {
-  if (nil == (self = [super init]))
+  if (nil != (self = [super init]))
     {
-      return nil;
+      if (nil == (_condition = [NSCondition new]))
+	{
+	  DESTROY(self);
+	}
+      else
+	{
+          _condition_value = value;
+	}
     }
-  if (nil == (_condition = [NSCondition new]))
-    {
-      DESTROY(self);
-      return nil;
-    }
-  _condition_value = value;
   return self;
 }
 

Source/NSMethodSignature.m

@@ -379,7 +379,6 @@ next_arg(const char *typePtr, NSArgumentInfo *info, char *outTypes)
   if (t == 0 || *t == '\0')
     {
       DESTROY(self);
-      self = nil;
     }
   else
     {

Source/NSNetServices.m

@@ -3072,7 +3072,7 @@ static void DNSSD_API
 - (id) init
 {
   DESTROY(self);
-  return nil;
+  return self;
 }
 
 /**

Source/NSURL.m

@@ -1872,7 +1872,7 @@ static unsigned	urlAlign;
       NSMapRemove((NSMapTable*)_clients, (void*)sender);
       [clientsLock unlock];
     }
-  DESTROY(self);
+  RELEASE(self);
 }
 
 @end

Source/NSURLHandle.m

@@ -321,7 +321,7 @@ static Class		NSURLHandleClass = 0;
     @selector(URLHandleResourceDidCancelLoading:)
     withObject: self];
   [self endLoadInBackground];
-  IF_NO_GC(DESTROY(self);)
+  IF_NO_GC(RELEASE(self);)
 }
 
 - (void) dealloc