Skip to content

Commit 471270e

Browse files
committed
Remove NS_NONATOMIC_IOSONLY macro as gcc seems to hate macros in property declarations.
1 parent bcc60ad commit 471270e

3 files changed

Lines changed: 14 additions & 10 deletions

File tree

CSFileHandle.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ extern NSExceptionName const CSFileErrorException;
5858
-(void)close;
5959

6060
// Public methods
61-
@property (NS_NONATOMIC_IOSONLY, readonly) FILE *filePointer NS_RETURNS_INNER_POINTER;
61+
@property (readonly) FILE *filePointer NS_RETURNS_INNER_POINTER;
6262

6363
// Implemented by this class
64-
@property (NS_NONATOMIC_IOSONLY, readonly) off_t fileSize;
65-
@property (NS_NONATOMIC_IOSONLY, readonly) off_t offsetInFile;
66-
@property (NS_NONATOMIC_IOSONLY, readonly) BOOL atEndOfFile;
64+
@property (readonly) off_t fileSize;
65+
@property (readonly) off_t offsetInFile;
66+
@property (readonly) BOOL atEndOfFile;
6767

6868
-(void)seekToFileOffset:(off_t)offs;
6969
-(void)seekToEndOfFile;

XADArchiveParser.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,9 @@ regex:(XADRegex *)regex firstFileExtension:(NSString *)firstext;
224224
-(CSHandle *)zeroLengthHandleWithChecksum:(BOOL)checksum;
225225
-(CSHandle *)subHandleFromSolidStreamForEntryWithDictionary:(NSDictionary *)dict;
226226

227-
@property (NS_NONATOMIC_IOSONLY, readonly) BOOL hasVolumes;
228-
@property (NS_NONATOMIC_IOSONLY, readonly, copy) NSArray *volumeSizes;
229-
@property (NS_NONATOMIC_IOSONLY, readonly, retain) CSHandle *currentHandle;
227+
@property (readonly) BOOL hasVolumes;
228+
@property (readonly, copy) NSArray *volumeSizes;
229+
@property (readonly, retain) CSHandle *currentHandle;
230230

231231
-(void)setObject:(id)object forPropertyKey:(XADArchiveKeys)key;
232232
-(void)addPropertiesFromDictionary:(NSDictionary *)dict;
@@ -243,7 +243,7 @@ regex:(XADRegex *)regex firstFileExtension:(NSString *)firstext;
243243
-(XADString *)XADStringWithCString:(const char *)cstring;
244244
-(XADString *)XADStringWithCString:(const char *)cstring encodingName:(XADStringEncodingName)encoding;
245245

246-
@property (NS_NONATOMIC_IOSONLY, readonly, copy) XADPath *XADPath;
246+
@property (readonly, copy) XADPath *XADPath;
247247
-(XADPath *)XADPathWithString:(NSString *)string;
248248
-(XADPath *)XADPathWithUnseparatedString:(NSString *)string;
249249
-(XADPath *)XADPathWithData:(NSData *)data separators:(const char *)separators;

XADTypes.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,18 @@
6868
#define NS_REFINED_FOR_SWIFT
6969
#endif
7070

71-
#ifndef NS_NONATOMIC_IOSONLY
72-
#define NS_NONATOMIC_IOSONLY atomic
71+
#ifndef NS_SWIFT_UNAVAILABLE
72+
#define NS_SWIFT_UNAVAILABLE(...)
7373
#endif
7474

7575
#ifndef NS_DESIGNATED_INITIALIZER
7676
#define NS_DESIGNATED_INITIALIZER
7777
#endif
7878

79+
#ifndef NS_RETURNS_INNER_POINTER
80+
#define NS_RETURNS_INNER_POINTER
81+
#endif
82+
7983
// To make other compilers happy
8084
#ifndef __has_attribute
8185
#define __has_attribute(...) 0

0 commit comments

Comments
 (0)