Tidied NO_GNUSTEP stuff

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

Headers/gnustep/base/NSArchiver.h

@@ -81,6 +81,7 @@
 	    withObject: (id)newObject;
 @end
 
+#ifndef	NO_GNUSTEP
 @interface	NSArchiver (GNUstep)
 
 /*
@@ -147,6 +148,7 @@
 - (void) encodeObject: (id)anObject
 	     withName: (id)name;
 @end
+#endif
 
 
 
@@ -199,6 +201,7 @@
 - (void) replaceObject: (id)anObject withObject: (id)replacement;
 @end
 
+#ifndef	NO_GNUSTEP
 @interface	NSUnarchiver (GNUstep)
 
 /*
@@ -264,7 +267,7 @@
 - (void) decodeObjectAt: (id*)anObject
 	       withName: (id*)name;
 @end
-
+#endif
 
 
 /* Exceptions */

Headers/gnustep/base/NSBundle.h

@@ -82,6 +82,7 @@ extern NSString* NSLoadedClasses;
 
 @end
 
+#ifndef	NO_GNUSTEP
 @interface NSBundle (GNUstep)
 
 + (NSString *) pathForGNUstepResource: (NSString *)name
@@ -89,6 +90,7 @@ extern NSString* NSLoadedClasses;
 			  inDirectory: (NSString *)bundlePath;
 
 @end
+#endif
 
 #define NSLocalizedString(key, comment) \
   [[NSBundle mainBundle] localizedStringForKey:(key) value:@"" table:nil]

Headers/gnustep/base/NSInvocation.h

@@ -79,6 +79,7 @@
 
 @end
 
+#ifndef	NO_GNUSTEP
 @interface NSInvocation (GNUstep)
 - (id) initWithArgframe: (arglist_t)frame selector: (SEL)aSelector;
 - (id) initWithMethodSignature: (NSMethodSignature*)aSignature;
@@ -86,7 +87,7 @@
 - (id) initWithTarget: target selector: (SEL)aSelector, ...;
 - (void*)returnFrame: (arglist_t)argFrame;
 @end
-
+#endif
 
 /* -initWithTarget:selector:, a method used in the macros
    is come from the MethodInvocation behavior.

Headers/gnustep/base/NSMethodSignature.h

@@ -28,6 +28,7 @@
 
 #include <Foundation/NSObject.h>
 
+#ifndef	STRICT_MACOS_X
 /*
  *	Info about layout of arguments.
  *	Extended from the original OpenStep version to let us know if the
@@ -39,22 +40,31 @@ typedef struct	{
   int		offset;
   unsigned	size;
   const char	*type;
+#ifndef	NO_GNUSTEP
   unsigned	align;
   unsigned	qual;
   BOOL		isReg;
+#endif
 } NSArgumentInfo;
+#endif
 
 @interface NSMethodSignature : NSObject
 {
     const char		*methodTypes;
     unsigned		argFrameLength;
     unsigned		numArgs;
+#ifdef	STRICT_MACOS_X
+    void		*dummy;
+#else
     NSArgumentInfo	*info;
+#endif
 }
 
 + (NSMethodSignature*) signatureWithObjCTypes: (const char*)types;
 
+#ifndef	STRICT_MACOS_X
 - (NSArgumentInfo) argumentInfoAtIndex: (unsigned)index;
+#endif
 - (unsigned) frameLength;
 - (const char*) getArgumentTypeAtIndex: (unsigned)index;
 - (BOOL) isOneway;
@@ -64,8 +74,11 @@ typedef struct	{
 
 @end
 
-@interface NSMethodSignature(GNU)
+#ifndef	NO_GNUSTEP
+@interface NSMethodSignature(GNUstep)
 - (NSArgumentInfo*) methodInfo;
 - (const char*) methodType;
 @end
+#endif
+
 #endif /* __NSMethodSignature_h_GNUSTEP_BASE_INCLUDE */

Headers/gnustep/base/NSNotification.h

@@ -76,6 +76,7 @@
 
 @end
 
+#ifndef	NO_GNUSTEP
 @interface NSNotificationCenter (GNUstep)
 
 /* Getting the default NotificationCenter */
@@ -103,5 +104,6 @@
 		       object: object
 		     userInfo: (NSDictionary*)user_info;
 @end
+#endif
 
 #endif /*__NSNotification_h_GNUSTEP_BASE_INCLUDE */

Headers/gnustep/base/NSPort.h

@@ -51,6 +51,7 @@ extern NSString *NSPortTimeoutException; /* OPENSTEP */
 
 @end
 
+#ifndef	NO_GNUSTEP
 @interface NSPort (GNUstep)
 
 - (void) close;
@@ -59,6 +60,7 @@ extern NSString *NSPortTimeoutException; /* OPENSTEP */
 - (Class) outPacketClass;
 
 @end
+#endif
 
 extern	NSString*	NSPortDidBecomeInvalidNotification;
 

Headers/gnustep/base/NSPortMessage.h

@@ -30,7 +30,6 @@
 @interface	NSPortMessage : NSObject
 {
     unsigned		msgid;
-    unsigned		sequence;
     NSMutableArray	*components;
 }
 - (id) initWithMachMessage: (void*)buffer;
@@ -45,10 +44,5 @@
 - (unsigned) msgid;
 @end
 
-@interface	NSPortMessage (GNUstep)
-- (void) setSequence: (unsigned)seq;
-- (unsigned) sequence;
-@end
-
 #endif
 

Headers/gnustep/base/NSPortNameServer.h

@@ -45,9 +45,11 @@
 - (void) removePortForName: (NSString*)name;
 @end
 
+#ifndef	NO_GNUSTEP
 @interface	NSPortNameServer (GNUstep)
 - (void) removePort: (NSPort*)port;		/* remove all names for port */
 @end
+#endif
 
 #endif
 

Source/NSPortMessage.m

@@ -98,15 +98,3 @@
 }
 @end
 
-@implementation	NSPortMessage (GNUstep)
-- (void) setSequence: (unsigned)seq
-{
-    sequence = seq;
-}
-
-- (unsigned) sequence
-{
-    return sequence;
-}
-@end
-