mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-25 09:41:15 +00:00
Fix header error spotted by Fred
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29817 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
81804929a2
commit
c49cb5cc49
33 changed files with 76 additions and 38 deletions
|
@ -63,7 +63,8 @@
|
||||||
#if defined(__MINGW32__)
|
#if defined(__MINGW32__)
|
||||||
WSAEVENT event;
|
WSAEVENT event;
|
||||||
#endif
|
#endif
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -74,7 +74,8 @@ extern "C" {
|
||||||
NSString *value;
|
NSString *value;
|
||||||
NSMutableDictionary *objects;
|
NSMutableDictionary *objects;
|
||||||
NSMutableDictionary *params;
|
NSMutableDictionary *params;
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -112,7 +113,8 @@ extern "C" {
|
||||||
#if GS_EXPOSE(GSMimeDocument)
|
#if GS_EXPOSE(GSMimeDocument)
|
||||||
NSMutableArray *headers;
|
NSMutableArray *headers;
|
||||||
id content;
|
id content;
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -219,7 +221,8 @@ extern "C" {
|
||||||
GSMimeParser *child;
|
GSMimeParser *child;
|
||||||
GSMimeCodingContext *context;
|
GSMimeCodingContext *context;
|
||||||
NSStringEncoding _defaultEncoding;
|
NSStringEncoding _defaultEncoding;
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -69,7 +69,8 @@ extern "C" {
|
||||||
unsigned _startPos; /* Where in data we started. */
|
unsigned _startPos; /* Where in data we started. */
|
||||||
BOOL _encodingRoot;
|
BOOL _encodingRoot;
|
||||||
BOOL _initialPass;
|
BOOL _initialPass;
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -176,7 +177,8 @@ extern "C" {
|
||||||
NSZone *zone; /* Zone for allocating objs. */
|
NSZone *zone; /* Zone for allocating objs. */
|
||||||
NSMutableDictionary *objDict; /* Class information store. */
|
NSMutableDictionary *objDict; /* Class information store. */
|
||||||
NSMutableArray *objSave;
|
NSMutableArray *objSave;
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -193,7 +193,8 @@ typedef struct autorelease_array_list
|
||||||
unsigned _released_count;
|
unsigned _released_count;
|
||||||
/* The method to add an object to this pool */
|
/* The method to add an object to this pool */
|
||||||
void (*_addImp)(id, SEL, id);
|
void (*_addImp)(id, SEL, id);
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -118,7 +118,8 @@ GS_EXPORT NSString* const NSLoadedClasses;
|
||||||
BOOL _codeLoaded;
|
BOOL _codeLoaded;
|
||||||
unsigned _version;
|
unsigned _version;
|
||||||
NSString *_frameworkVersion;
|
NSString *_frameworkVersion;
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -60,7 +60,8 @@ extern "C" {
|
||||||
NSMutableArray *_accesses;
|
NSMutableArray *_accesses;
|
||||||
/** Total number of accesses to objects */
|
/** Total number of accesses to objects */
|
||||||
int64_t _totalAccesses;
|
int64_t _totalAccesses;
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -76,7 +76,8 @@ typedef enum _NSPredicateOperatorType
|
||||||
SEL _selector;
|
SEL _selector;
|
||||||
NSUInteger _options;
|
NSUInteger _options;
|
||||||
NSPredicateOperatorType _type;
|
NSPredicateOperatorType _type;
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
@public
|
@public
|
||||||
|
|
|
@ -105,7 +105,8 @@ extern "C" {
|
||||||
#if GS_EXPOSE(NSDateFormatter)
|
#if GS_EXPOSE(NSDateFormatter)
|
||||||
NSString *_dateFormat;
|
NSString *_dateFormat;
|
||||||
BOOL _allowsNaturalLanguage;
|
BOOL _allowsNaturalLanguage;
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -128,7 +128,8 @@ extern "C" {
|
||||||
BOOL _raiseOnOverflow;
|
BOOL _raiseOnOverflow;
|
||||||
BOOL _raiseOnUnderflow;
|
BOOL _raiseOnUnderflow;
|
||||||
BOOL _raiseOnDivideByZero;
|
BOOL _raiseOnDivideByZero;
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,7 +39,8 @@ extern "C" {
|
||||||
#if GS_EXPOSE(NSDistributedLock)
|
#if GS_EXPOSE(NSDistributedLock)
|
||||||
NSString *_lockPath;
|
NSString *_lockPath;
|
||||||
NSDate *_lockTime;
|
NSDate *_lockTime;
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -85,7 +85,8 @@ GS_EXPORT NSString* const GSNetworkNotificationCenterType;
|
||||||
NSString *_type; /* Type of notification center. */
|
NSString *_type; /* Type of notification center. */
|
||||||
id _remote; /* Proxy for center. */
|
id _remote; /* Proxy for center. */
|
||||||
BOOL _suspended; /* Is delivery suspended? */
|
BOOL _suspended; /* Is delivery suspended? */
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -120,7 +120,8 @@ GS_EXPORT NSString* const NSCocoaErrorDomain;
|
||||||
int _code;
|
int _code;
|
||||||
NSString *_domain;
|
NSString *_domain;
|
||||||
NSDictionary *_userInfo;
|
NSDictionary *_userInfo;
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -161,7 +161,8 @@ GS_EXPORT NSString * const NSFileHandleOperationException;
|
||||||
@private
|
@private
|
||||||
NSFileHandle *_readHandle;
|
NSFileHandle *_readHandle;
|
||||||
NSFileHandle *_writeHandle;
|
NSFileHandle *_writeHandle;
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -199,7 +199,8 @@ typedef uint32_t OSType;
|
||||||
#if GS_EXPOSE(NSFileManager)
|
#if GS_EXPOSE(NSFileManager)
|
||||||
@private
|
@private
|
||||||
NSString *_lastError;
|
NSString *_lastError;
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -378,7 +379,8 @@ typedef uint32_t OSType;
|
||||||
BOOL isFollowing: 1;
|
BOOL isFollowing: 1;
|
||||||
BOOL justContents: 1;
|
BOOL justContents: 1;
|
||||||
} _flags;
|
} _flags;
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,7 +43,8 @@ extern "C" {
|
||||||
@private
|
@private
|
||||||
NSSet *_names;
|
NSSet *_names;
|
||||||
NSSet *_addresses;
|
NSSet *_addresses;
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,7 +49,8 @@ extern "C" {
|
||||||
NSUInteger _hash;
|
NSUInteger _hash;
|
||||||
NSUInteger _length;
|
NSUInteger _length;
|
||||||
NSUInteger *_indexes;
|
NSUInteger *_indexes;
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,7 +49,8 @@ extern "C" {
|
||||||
BOOL _validReturn;
|
BOOL _validReturn;
|
||||||
BOOL _sendToSuper;
|
BOOL _sendToSuper;
|
||||||
void *_retptr;
|
void *_retptr;
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -70,7 +70,8 @@ extern "C" {
|
||||||
NSMutableDictionary *_enc; /* Object being encoded. */
|
NSMutableDictionary *_enc; /* Object being encoded. */
|
||||||
NSMutableArray *_obj; /* Array of objects. */
|
NSMutableArray *_obj; /* Array of objects. */
|
||||||
NSPropertyListFormat _format;
|
NSPropertyListFormat _format;
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -238,7 +239,8 @@ extern "C" {
|
||||||
#undef GSIArray
|
#undef GSIArray
|
||||||
#endif
|
#endif
|
||||||
NSZone *_zone; /* Zone for allocating objs. */
|
NSZone *_zone; /* Zone for allocating objs. */
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -94,7 +94,8 @@ extern "C" {
|
||||||
NSString *_positiveFormat;
|
NSString *_positiveFormat;
|
||||||
NSDictionary *_attributesForPositiveValues;
|
NSDictionary *_attributesForPositiveValues;
|
||||||
NSDictionary *_attributesForNegativeValues;
|
NSDictionary *_attributesForNegativeValues;
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -210,7 +210,8 @@ typedef SOCKET NSSocketNativeHandle;
|
||||||
WSAEVENT eventListener;
|
WSAEVENT eventListener;
|
||||||
NSMapTable *events;
|
NSMapTable *events;
|
||||||
#endif
|
#endif
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -93,7 +93,8 @@ extern "C" {
|
||||||
unsigned _cursor; /* Position in data buffer. */
|
unsigned _cursor; /* Position in data buffer. */
|
||||||
unsigned _version; /* Version of archiver used. */
|
unsigned _version; /* Version of archiver used. */
|
||||||
NSZone *_zone; /* Zone for allocating objs. */
|
NSZone *_zone; /* Zone for allocating objs. */
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,7 +50,8 @@ extern "C" {
|
||||||
NSPort *_recv;
|
NSPort *_recv;
|
||||||
NSPort *_send;
|
NSPort *_send;
|
||||||
NSMutableArray *_components;
|
NSMutableArray *_components;
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -59,7 +59,8 @@ extern "C" {
|
||||||
#if GS_EXPOSE(NSSocketPortNameServer)
|
#if GS_EXPOSE(NSSocketPortNameServer)
|
||||||
NSMapTable *_portMap; /* Registered ports information. */
|
NSMapTable *_portMap; /* Registered ports information. */
|
||||||
NSMapTable *_nameMap; /* Registered names information. */
|
NSMapTable *_nameMap; /* Registered names information. */
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,7 +41,8 @@ extern "C" {
|
||||||
@private
|
@private
|
||||||
Protocol *_myProtocol;
|
Protocol *_myProtocol;
|
||||||
NSObject *_myTarget;
|
NSObject *_myTarget;
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,7 +49,8 @@ extern "C" {
|
||||||
unichar _decimal;
|
unichar _decimal;
|
||||||
BOOL _caseSensitive;
|
BOOL _caseSensitive;
|
||||||
BOOL _isUnicode;
|
BOOL _isUnicode;
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,7 +49,8 @@ extern "C" {
|
||||||
NSString *_key;
|
NSString *_key;
|
||||||
BOOL _ascending;
|
BOOL _ascending;
|
||||||
SEL _selector;
|
SEL _selector;
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -53,7 +53,8 @@ extern "C" {
|
||||||
BOOL _hasTerminated;
|
BOOL _hasTerminated;
|
||||||
BOOL _hasCollected;
|
BOOL _hasCollected;
|
||||||
BOOL _hasNotified;
|
BOOL _hasNotified;
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -71,7 +71,8 @@ extern "C" {
|
||||||
struct autorelease_thread_vars _autorelease_vars;
|
struct autorelease_thread_vars _autorelease_vars;
|
||||||
id _gcontext;
|
id _gcontext;
|
||||||
void *_runLoopInfo; // Per-thread runloop related info.
|
void *_runLoopInfo; // Per-thread runloop related info.
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused; // For future expansion
|
void *_unused; // For future expansion
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,7 +50,8 @@ extern "C" {
|
||||||
id _target;
|
id _target;
|
||||||
SEL _selector;
|
SEL _selector;
|
||||||
id _info;
|
id _info;
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -97,7 +97,8 @@ GS_EXPORT NSString* const NSUndoManagerWillUndoChangeNotification;
|
||||||
BOOL _runLoopGroupingPending;
|
BOOL _runLoopGroupingPending;
|
||||||
unsigned _disableCount;
|
unsigned _disableCount;
|
||||||
unsigned _levelsOfUndo;
|
unsigned _levelsOfUndo;
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -227,7 +227,8 @@ GS_EXPORT NSString* const GSLocale;
|
||||||
NSDate *_lastSync;
|
NSDate *_lastSync;
|
||||||
NSRecursiveLock *_lock;
|
NSRecursiveLock *_lock;
|
||||||
NSDistributedLock *_fileLock;
|
NSDistributedLock *_fileLock;
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -87,7 +87,8 @@ typedef NSUInteger NSXMLNodeKind;
|
||||||
NSXMLNode *_parent;
|
NSXMLNode *_parent;
|
||||||
NSUInteger _index;
|
NSUInteger _index;
|
||||||
id _objectValue;
|
id _objectValue;
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -73,7 +73,8 @@ GS_EXPORT NSString* const NSXMLParserErrorDomain;
|
||||||
@public
|
@public
|
||||||
void *_parser; // GSXMLParser
|
void *_parser; // GSXMLParser
|
||||||
void *_handler; // SAXHandler
|
void *_handler; // SAXHandler
|
||||||
#elif !GS_NONFRAGILE
|
#endif
|
||||||
|
#if !GS_NONFRAGILE
|
||||||
void *_unused;
|
void *_unused;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue