From b59b875d50e17640048863780b1416646fc2e9be Mon Sep 17 00:00:00 2001
From: Richard Frith-MacDonald <rfm@gnu.org>
Date: Sun, 28 Feb 2010 19:43:35 +0000
Subject: [PATCH] mprove ifdef's for non-fragile-abi

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29809 72102866-910b-0410-8b05-ffd578937521
---
 Headers/Additions/GNUstepBase/GSFileHandle.h         | 1 +
 Headers/Additions/GNUstepBase/GSMime.h               | 3 +++
 Headers/Foundation/NSArchiver.h                      | 2 ++
 Headers/Foundation/NSAutoreleasePool.h               | 1 +
 Headers/Foundation/NSBundle.h                        | 1 +
 Headers/Foundation/NSCache.h                         | 1 +
 Headers/Foundation/NSComparisonPredicate.h           | 3 ++-
 Headers/Foundation/NSDateFormatter.h                 | 1 +
 Headers/Foundation/NSDecimalNumber.h                 | 1 +
 Headers/Foundation/NSDistributedLock.h               | 1 +
 Headers/Foundation/NSDistributedNotificationCenter.h | 1 +
 Headers/Foundation/NSError.h                         | 1 +
 Headers/Foundation/NSFileHandle.h                    | 1 +
 Headers/Foundation/NSFileManager.h                   | 2 ++
 Headers/Foundation/NSHost.h                          | 1 +
 Headers/Foundation/NSIndexPath.h                     | 1 +
 Headers/Foundation/NSInvocation.h                    | 1 +
 Headers/Foundation/NSKeyedArchiver.h                 | 2 ++
 Headers/Foundation/NSNumberFormatter.h               | 1 +
 Headers/Foundation/NSPort.h                          | 1 +
 Headers/Foundation/NSPortCoder.h                     | 1 +
 Headers/Foundation/NSPortMessage.h                   | 1 +
 Headers/Foundation/NSPortNameServer.h                | 1 +
 Headers/Foundation/NSProtocolChecker.h               | 1 +
 Headers/Foundation/NSScanner.h                       | 1 +
 Headers/Foundation/NSSortDescriptor.h                | 1 +
 Headers/Foundation/NSTask.h                          | 1 +
 Headers/Foundation/NSThread.h                        | 1 +
 Headers/Foundation/NSTimer.h                         | 1 +
 Headers/Foundation/NSUndoManager.h                   | 3 ++-
 Headers/Foundation/NSUserDefaults.h                  | 1 +
 Headers/Foundation/NSXMLNode.h                       | 1 +
 Headers/Foundation/NSXMLParser.h                     | 1 +
 33 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/Headers/Additions/GNUstepBase/GSFileHandle.h b/Headers/Additions/GNUstepBase/GSFileHandle.h
index 8c90f0994..0f9f64c29 100644
--- a/Headers/Additions/GNUstepBase/GSFileHandle.h
+++ b/Headers/Additions/GNUstepBase/GSFileHandle.h
@@ -63,6 +63,7 @@
 #if	defined(__MINGW32__)
   WSAEVENT  		event;
 #endif
+#elif	!GS_NONFRAGILE
   void			*_unused;
 #endif
 }
diff --git a/Headers/Additions/GNUstepBase/GSMime.h b/Headers/Additions/GNUstepBase/GSMime.h
index f6eb4c346..4d40cd0e5 100644
--- a/Headers/Additions/GNUstepBase/GSMime.h
+++ b/Headers/Additions/GNUstepBase/GSMime.h
@@ -74,6 +74,7 @@ extern "C" {
   NSString              *value;
   NSMutableDictionary   *objects;
   NSMutableDictionary	*params;
+#elif	!GS_NONFRAGILE
   void			*_unused;
 #endif
 }
@@ -111,6 +112,7 @@ extern "C" {
 #if	GS_EXPOSE(GSMimeDocument)
   NSMutableArray	*headers;
   id			content;
+#elif	!GS_NONFRAGILE
   void			*_unused;
 #endif
 }
@@ -217,6 +219,7 @@ extern "C" {
   GSMimeParser		*child;
   GSMimeCodingContext	*context;
   NSStringEncoding	_defaultEncoding;
+#elif	!GS_NONFRAGILE
   void			*_unused;
 #endif
 }
diff --git a/Headers/Foundation/NSArchiver.h b/Headers/Foundation/NSArchiver.h
index 923970291..6fb4318e3 100644
--- a/Headers/Foundation/NSArchiver.h
+++ b/Headers/Foundation/NSArchiver.h
@@ -69,6 +69,7 @@ extern "C" {
   unsigned	_startPos;	/* Where in data we started.	*/
   BOOL		_encodingRoot;
   BOOL		_initialPass;
+#elif	!GS_NONFRAGILE
   void		*_unused;
 #endif
 }
@@ -175,6 +176,7 @@ extern "C" {
   NSZone		*zone;		/* Zone for allocating objs.	*/
   NSMutableDictionary	*objDict;	/* Class information store.	*/
   NSMutableArray	*objSave;
+#elif	!GS_NONFRAGILE
   void			*_unused;
 #endif
 }
diff --git a/Headers/Foundation/NSAutoreleasePool.h b/Headers/Foundation/NSAutoreleasePool.h
index f68085d11..4b1cf5e99 100644
--- a/Headers/Foundation/NSAutoreleasePool.h
+++ b/Headers/Foundation/NSAutoreleasePool.h
@@ -193,6 +193,7 @@ typedef struct autorelease_array_list
   unsigned _released_count;
   /* The method to add an object to this pool */
   void 	(*_addImp)(id, SEL, id);
+#elif	!GS_NONFRAGILE
   void	*_unused;
 #endif
 }
diff --git a/Headers/Foundation/NSBundle.h b/Headers/Foundation/NSBundle.h
index ecade1016..7600d341b 100644
--- a/Headers/Foundation/NSBundle.h
+++ b/Headers/Foundation/NSBundle.h
@@ -118,6 +118,7 @@ GS_EXPORT NSString* const NSLoadedClasses;
   BOOL			_codeLoaded;
   unsigned		_version;
   NSString      	*_frameworkVersion;
+#elif	!GS_NONFRAGILE
   void			*_unused;
 #endif
 }
diff --git a/Headers/Foundation/NSCache.h b/Headers/Foundation/NSCache.h
index 9aa7643b5..bf817b3b8 100644
--- a/Headers/Foundation/NSCache.h
+++ b/Headers/Foundation/NSCache.h
@@ -60,6 +60,7 @@ extern "C" {
   NSMutableArray *_accesses;
   /** Total number of accesses to objects */
   int64_t _totalAccesses;
+#elif	!GS_NONFRAGILE
   void	*_unused;
 #endif
 }
diff --git a/Headers/Foundation/NSComparisonPredicate.h b/Headers/Foundation/NSComparisonPredicate.h
index 44ec9f65a..688374fa8 100644
--- a/Headers/Foundation/NSComparisonPredicate.h
+++ b/Headers/Foundation/NSComparisonPredicate.h
@@ -76,11 +76,12 @@ typedef enum _NSPredicateOperatorType
   SEL				_selector;
   NSUInteger			_options;
   NSPredicateOperatorType	_type;
+#elif	!GS_NONFRAGILE
   void				*_unused;
+#endif
   @public
   NSExpression			*_left;
   NSExpression			*_right;
-#endif
 }
 
 + (NSPredicate *) predicateWithLeftExpression: (NSExpression *)left
diff --git a/Headers/Foundation/NSDateFormatter.h b/Headers/Foundation/NSDateFormatter.h
index b64d81be8..7862cd4be 100644
--- a/Headers/Foundation/NSDateFormatter.h
+++ b/Headers/Foundation/NSDateFormatter.h
@@ -105,6 +105,7 @@ extern "C" {
 #if	GS_EXPOSE(NSDateFormatter)
   NSString	*_dateFormat;
   BOOL		_allowsNaturalLanguage;
+#elif	!GS_NONFRAGILE
   void		*_unused;
 #endif
 }
diff --git a/Headers/Foundation/NSDecimalNumber.h b/Headers/Foundation/NSDecimalNumber.h
index 3f7f4ed04..c6fb2a7ba 100644
--- a/Headers/Foundation/NSDecimalNumber.h
+++ b/Headers/Foundation/NSDecimalNumber.h
@@ -128,6 +128,7 @@ extern "C" {
   BOOL _raiseOnOverflow; 
   BOOL _raiseOnUnderflow;
   BOOL _raiseOnDivideByZero;
+#elif	!GS_NONFRAGILE
   void	*_unused;
 #endif
 }
diff --git a/Headers/Foundation/NSDistributedLock.h b/Headers/Foundation/NSDistributedLock.h
index 4c207ad66..695f09650 100644
--- a/Headers/Foundation/NSDistributedLock.h
+++ b/Headers/Foundation/NSDistributedLock.h
@@ -39,6 +39,7 @@ extern "C" {
 #if	GS_EXPOSE(NSDistributedLock)
   NSString	*_lockPath;
   NSDate	*_lockTime;
+#elif	!GS_NONFRAGILE
   void		*_unused;
 #endif
 }
diff --git a/Headers/Foundation/NSDistributedNotificationCenter.h b/Headers/Foundation/NSDistributedNotificationCenter.h
index 384d18347..eff07b7ab 100644
--- a/Headers/Foundation/NSDistributedNotificationCenter.h
+++ b/Headers/Foundation/NSDistributedNotificationCenter.h
@@ -85,6 +85,7 @@ GS_EXPORT NSString* const GSNetworkNotificationCenterType;
   NSString	*_type;		/* Type of notification center.	*/
   id		_remote;	/* Proxy for center.		*/
   BOOL		_suspended;	/* Is delivery suspended?	*/
+#elif	!GS_NONFRAGILE
   void		*_unused;
 #endif
 }
diff --git a/Headers/Foundation/NSError.h b/Headers/Foundation/NSError.h
index dacb79016..17517cc2f 100644
--- a/Headers/Foundation/NSError.h
+++ b/Headers/Foundation/NSError.h
@@ -120,6 +120,7 @@ GS_EXPORT NSString* const NSCocoaErrorDomain;
   int		_code;
   NSString	*_domain;
   NSDictionary	*_userInfo;
+#elif	!GS_NONFRAGILE
   void		*_unused;
 #endif
 }
diff --git a/Headers/Foundation/NSFileHandle.h b/Headers/Foundation/NSFileHandle.h
index 49f9c1f11..dffb4140a 100644
--- a/Headers/Foundation/NSFileHandle.h
+++ b/Headers/Foundation/NSFileHandle.h
@@ -161,6 +161,7 @@ GS_EXPORT NSString * const NSFileHandleOperationException;
 @private
   NSFileHandle	*_readHandle;
   NSFileHandle	*_writeHandle;
+#elif	!GS_NONFRAGILE
   void		*_unused;
 #endif
 }
diff --git a/Headers/Foundation/NSFileManager.h b/Headers/Foundation/NSFileManager.h
index 21f61972a..08b8b7411 100644
--- a/Headers/Foundation/NSFileManager.h
+++ b/Headers/Foundation/NSFileManager.h
@@ -199,6 +199,7 @@ typedef	uint32_t	OSType;
 #if	GS_EXPOSE(NSFileManager)
 @private
   NSString	*_lastError;
+#elif	!GS_NONFRAGILE
   void		*_unused;
 #endif
 }
@@ -377,6 +378,7 @@ typedef	uint32_t	OSType;
     BOOL isFollowing: 1;
     BOOL justContents: 1;
   } _flags;
+#elif	!GS_NONFRAGILE
   void	*_unused;
 #endif
 }
diff --git a/Headers/Foundation/NSHost.h b/Headers/Foundation/NSHost.h
index aeaf88e6d..5ea6eb199 100644
--- a/Headers/Foundation/NSHost.h
+++ b/Headers/Foundation/NSHost.h
@@ -43,6 +43,7 @@ extern "C" {
   @private
   NSSet	*_names;
   NSSet	*_addresses;
+#elif	!GS_NONFRAGILE
   void *_unused;
 #endif
 }
diff --git a/Headers/Foundation/NSIndexPath.h b/Headers/Foundation/NSIndexPath.h
index 95d1dcca6..1926027d2 100644
--- a/Headers/Foundation/NSIndexPath.h
+++ b/Headers/Foundation/NSIndexPath.h
@@ -49,6 +49,7 @@ extern "C" {
   NSUInteger	_hash;
   NSUInteger	_length;
   NSUInteger	*_indexes;
+#elif	!GS_NONFRAGILE
   void		*_unused;
 #endif
 }
diff --git a/Headers/Foundation/NSInvocation.h b/Headers/Foundation/NSInvocation.h
index 7ea063552..ca9adc235 100644
--- a/Headers/Foundation/NSInvocation.h
+++ b/Headers/Foundation/NSInvocation.h
@@ -49,6 +49,7 @@ extern "C" {
   BOOL			_validReturn;
   BOOL			_sendToSuper;
   void			*_retptr;
+#elif	!GS_NONFRAGILE
   void			*_unused;
 #endif
 }
diff --git a/Headers/Foundation/NSKeyedArchiver.h b/Headers/Foundation/NSKeyedArchiver.h
index d97318082..c7e51b4f7 100644
--- a/Headers/Foundation/NSKeyedArchiver.h
+++ b/Headers/Foundation/NSKeyedArchiver.h
@@ -70,6 +70,7 @@ extern "C" {
   NSMutableDictionary	*_enc;	/* Object being encoded.	*/
   NSMutableArray	*_obj;	/* Array of objects.		*/
   NSPropertyListFormat	_format;
+#elif	!GS_NONFRAGILE
   void			*_unused;
 #endif
 }
@@ -237,6 +238,7 @@ extern "C" {
 #undef	GSIArray
 #endif
   NSZone	*_zone;		/* Zone for allocating objs.	*/
+#elif	!GS_NONFRAGILE
   void		*_unused;
 #endif
 }
diff --git a/Headers/Foundation/NSNumberFormatter.h b/Headers/Foundation/NSNumberFormatter.h
index ee86c3629..bd028a1a0 100644
--- a/Headers/Foundation/NSNumberFormatter.h
+++ b/Headers/Foundation/NSNumberFormatter.h
@@ -94,6 +94,7 @@ extern "C" {
   NSString *_positiveFormat;
   NSDictionary *_attributesForPositiveValues;
   NSDictionary *_attributesForNegativeValues;
+#elif	!GS_NONFRAGILE
   void		*_unused;
 #endif
 }
diff --git a/Headers/Foundation/NSPort.h b/Headers/Foundation/NSPort.h
index 2f9b573cd..967daeca8 100644
--- a/Headers/Foundation/NSPort.h
+++ b/Headers/Foundation/NSPort.h
@@ -210,6 +210,7 @@ typedef SOCKET NSSocketNativeHandle;
   WSAEVENT              eventListener;
   NSMapTable            *events;
 #endif
+#elif	!GS_NONFRAGILE
   void			*_unused;
 #endif
 }
diff --git a/Headers/Foundation/NSPortCoder.h b/Headers/Foundation/NSPortCoder.h
index 7327bd64c..905682ae3 100644
--- a/Headers/Foundation/NSPortCoder.h
+++ b/Headers/Foundation/NSPortCoder.h
@@ -93,6 +93,7 @@ extern "C" {
   unsigned		_cursor;	/* Position in data buffer.	*/
   unsigned		_version;	/* Version of archiver used.	*/
   NSZone		*_zone;		/* Zone for allocating objs.	*/
+#elif	!GS_NONFRAGILE
   void			*_unused;
 #endif
 }
diff --git a/Headers/Foundation/NSPortMessage.h b/Headers/Foundation/NSPortMessage.h
index 37834d9bb..341ea420a 100644
--- a/Headers/Foundation/NSPortMessage.h
+++ b/Headers/Foundation/NSPortMessage.h
@@ -50,6 +50,7 @@ extern "C" {
   NSPort		*_recv;
   NSPort		*_send;
   NSMutableArray	*_components;
+#elif	!GS_NONFRAGILE
   void			*_unused;
 #endif
 }
diff --git a/Headers/Foundation/NSPortNameServer.h b/Headers/Foundation/NSPortNameServer.h
index 5a01c8c2d..39b0f5fc2 100644
--- a/Headers/Foundation/NSPortNameServer.h
+++ b/Headers/Foundation/NSPortNameServer.h
@@ -59,6 +59,7 @@ extern "C" {
 #if	GS_EXPOSE(NSSocketPortNameServer)
   NSMapTable	*_portMap;	/* Registered ports information.	*/
   NSMapTable	*_nameMap;	/* Registered names information.	*/
+#elif	!GS_NONFRAGILE
   void		*_unused;
 #endif
 }
diff --git a/Headers/Foundation/NSProtocolChecker.h b/Headers/Foundation/NSProtocolChecker.h
index 410c4a0a1..67b520a4b 100644
--- a/Headers/Foundation/NSProtocolChecker.h
+++ b/Headers/Foundation/NSProtocolChecker.h
@@ -41,6 +41,7 @@ extern "C" {
 @private
   Protocol *_myProtocol;
   NSObject *_myTarget;
+#elif	!GS_NONFRAGILE
   void	*_unused;
 #endif
 }
diff --git a/Headers/Foundation/NSScanner.h b/Headers/Foundation/NSScanner.h
index 47790591e..411f27786 100644
--- a/Headers/Foundation/NSScanner.h
+++ b/Headers/Foundation/NSScanner.h
@@ -49,6 +49,7 @@ extern "C" {
   unichar		_decimal;
   BOOL			_caseSensitive;
   BOOL			_isUnicode;
+#elif	!GS_NONFRAGILE
   void			*_unused;
 #endif
 }
diff --git a/Headers/Foundation/NSSortDescriptor.h b/Headers/Foundation/NSSortDescriptor.h
index 186cf1090..b71d82c05 100644
--- a/Headers/Foundation/NSSortDescriptor.h
+++ b/Headers/Foundation/NSSortDescriptor.h
@@ -49,6 +49,7 @@ extern "C" {
   NSString *_key;
   BOOL	_ascending;
   SEL	_selector;
+#elif	!GS_NONFRAGILE
   void	*_unused;
 #endif
 }
diff --git a/Headers/Foundation/NSTask.h b/Headers/Foundation/NSTask.h
index 0f402b97e..7105cb8ae 100644
--- a/Headers/Foundation/NSTask.h
+++ b/Headers/Foundation/NSTask.h
@@ -53,6 +53,7 @@ extern "C" {
   BOOL		_hasTerminated;
   BOOL		_hasCollected;
   BOOL		_hasNotified;
+#elif	!GS_NONFRAGILE
   void		*_unused;
 #endif
 }
diff --git a/Headers/Foundation/NSThread.h b/Headers/Foundation/NSThread.h
index b798d9723..5779a6ba6 100644
--- a/Headers/Foundation/NSThread.h
+++ b/Headers/Foundation/NSThread.h
@@ -71,6 +71,7 @@ extern "C" {
   struct autorelease_thread_vars _autorelease_vars;
   id			_gcontext;
   void                  *_runLoopInfo;  // Per-thread runloop related info.
+#elif	!GS_NONFRAGILE
   void                  *_unused;     // For future expansion
 #endif
 }
diff --git a/Headers/Foundation/NSTimer.h b/Headers/Foundation/NSTimer.h
index f8f71506d..fc35015a0 100644
--- a/Headers/Foundation/NSTimer.h
+++ b/Headers/Foundation/NSTimer.h
@@ -50,6 +50,7 @@ extern "C" {
   id		_target;
   SEL		_selector;
   id		_info;
+#elif	!GS_NONFRAGILE
   void		*_unused;
 #endif
 }
diff --git a/Headers/Foundation/NSUndoManager.h b/Headers/Foundation/NSUndoManager.h
index 52f161949..38b65d3ad 100644
--- a/Headers/Foundation/NSUndoManager.h
+++ b/Headers/Foundation/NSUndoManager.h
@@ -88,7 +88,6 @@ GS_EXPORT NSString* const NSUndoManagerWillUndoChangeNotification;
 @private
   NSMutableArray	*_redoStack;
   NSMutableArray	*_undoStack;
-  id			*_unused1;
   id			_group;
   id			_nextTarget;
   NSArray		*_modes;
@@ -98,6 +97,8 @@ GS_EXPORT NSString* const NSUndoManagerWillUndoChangeNotification;
   BOOL			_runLoopGroupingPending;
   unsigned		_disableCount;
   unsigned		_levelsOfUndo;
+#elif	!GS_NONFRAGILE
+  void			*_unused;
 #endif
 }
 
diff --git a/Headers/Foundation/NSUserDefaults.h b/Headers/Foundation/NSUserDefaults.h
index f5d9fe6aa..1966557a2 100644
--- a/Headers/Foundation/NSUserDefaults.h
+++ b/Headers/Foundation/NSUserDefaults.h
@@ -227,6 +227,7 @@ GS_EXPORT NSString* const GSLocale;
   NSDate		*_lastSync;
   NSRecursiveLock	*_lock;
   NSDistributedLock	*_fileLock;
+#elif	!GS_NONFRAGILE
   void			*_unused;
 #endif
 }
diff --git a/Headers/Foundation/NSXMLNode.h b/Headers/Foundation/NSXMLNode.h
index aeaf51345..beaa7da3b 100644
--- a/Headers/Foundation/NSXMLNode.h
+++ b/Headers/Foundation/NSXMLNode.h
@@ -87,6 +87,7 @@ typedef NSUInteger NSXMLNodeKind;
   NSXMLNode     *_parent;
   NSUInteger    _index;
   id            _objectValue;
+#elif	!GS_NONFRAGILE
   void		*_unused;
 #endif
 }
diff --git a/Headers/Foundation/NSXMLParser.h b/Headers/Foundation/NSXMLParser.h
index b506c7723..1d03b6f00 100644
--- a/Headers/Foundation/NSXMLParser.h
+++ b/Headers/Foundation/NSXMLParser.h
@@ -73,6 +73,7 @@ GS_EXPORT NSString* const NSXMLParserErrorDomain;
 @public
   void		*_parser;	// GSXMLParser
   void		*_handler;	// SAXHandler
+#elif	!GS_NONFRAGILE
   void		*_unused;
 #endif
 }