Remove NS_NONATOMIC_IOSONLY macro as gcc seems to hate macros in prop…

…erty declarations.
MacPaw · Feb 7, 2025 · 471270e · 471270e
1 parent bcc60ad
commit 471270e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/CSFileHandle.h b/CSFileHandle.h
@@ -58,12 +58,12 @@ extern NSExceptionName const CSFileErrorException;
 -(void)close;
 
 // Public methods
-@property (NS_NONATOMIC_IOSONLY, readonly) FILE *filePointer NS_RETURNS_INNER_POINTER;
+@property (readonly) FILE *filePointer NS_RETURNS_INNER_POINTER;
 
 // Implemented by this class
-@property (NS_NONATOMIC_IOSONLY, readonly) off_t fileSize;
-@property (NS_NONATOMIC_IOSONLY, readonly) off_t offsetInFile;
-@property (NS_NONATOMIC_IOSONLY, readonly) BOOL atEndOfFile;
+@property (readonly) off_t fileSize;
+@property (readonly) off_t offsetInFile;
+@property (readonly) BOOL atEndOfFile;
 
 -(void)seekToFileOffset:(off_t)offs;
 -(void)seekToEndOfFile;

diff --git a/XADArchiveParser.h b/XADArchiveParser.h
@@ -224,9 +224,9 @@ regex:(XADRegex *)regex firstFileExtension:(NSString *)firstext;
 -(CSHandle *)zeroLengthHandleWithChecksum:(BOOL)checksum;
 -(CSHandle *)subHandleFromSolidStreamForEntryWithDictionary:(NSDictionary *)dict;
 
-@property (NS_NONATOMIC_IOSONLY, readonly) BOOL hasVolumes;
-@property (NS_NONATOMIC_IOSONLY, readonly, copy) NSArray *volumeSizes;
-@property (NS_NONATOMIC_IOSONLY, readonly, retain) CSHandle *currentHandle;
+@property (readonly) BOOL hasVolumes;
+@property (readonly, copy) NSArray *volumeSizes;
+@property (readonly, retain) CSHandle *currentHandle;
 
 -(void)setObject:(id)object forPropertyKey:(XADArchiveKeys)key;
 -(void)addPropertiesFromDictionary:(NSDictionary *)dict;
@@ -243,7 +243,7 @@ regex:(XADRegex *)regex firstFileExtension:(NSString *)firstext;
 -(XADString *)XADStringWithCString:(const char *)cstring;
 -(XADString *)XADStringWithCString:(const char *)cstring encodingName:(XADStringEncodingName)encoding;
 
-@property (NS_NONATOMIC_IOSONLY, readonly, copy) XADPath *XADPath;
+@property (readonly, copy) XADPath *XADPath;
 -(XADPath *)XADPathWithString:(NSString *)string;
 -(XADPath *)XADPathWithUnseparatedString:(NSString *)string;
 -(XADPath *)XADPathWithData:(NSData *)data separators:(const char *)separators;

diff --git a/XADTypes.h b/XADTypes.h
@@ -68,14 +68,18 @@
 #define NS_REFINED_FOR_SWIFT
 #endif
 
-#ifndef NS_NONATOMIC_IOSONLY
-#define NS_NONATOMIC_IOSONLY atomic
+#ifndef NS_SWIFT_UNAVAILABLE
+#define NS_SWIFT_UNAVAILABLE(...)
 #endif
 
 #ifndef NS_DESIGNATED_INITIALIZER
 #define NS_DESIGNATED_INITIALIZER
 #endif
 
+#ifndef NS_RETURNS_INNER_POINTER
+#define NS_RETURNS_INNER_POINTER
+#endif
+
 // To make other compilers happy
 #ifndef __has_attribute
 #define __has_attribute(...) 0