Revision: 13823
http://sourceforge.net/p/skim-app/code/13823
Author: hofman
Date: 2023-12-04 10:16:59 +0000 (Mon, 04 Dec 2023)
Log Message:
-----------
escape nullability qualifiers and macros when nullabiulity is not supported by
the compiler
Modified Paths:
--------------
trunk/SkimNotes/SkimNotes.rtf
trunk/SkimNotes/SkimNotesBase_Prefix.pch
trunk/SkimNotes/SkimNotes_Prefix.pch
trunk/SkimNotes/SkimNotes_Tool_Prefix.pch
trunk/SkimNotes/SkimPDF_Tool_Prefix.pch
Modified: trunk/SkimNotes/SkimNotes.rtf
===================================================================
--- trunk/SkimNotes/SkimNotes.rtf 2023-12-03 23:46:26 UTC (rev 13822)
+++ trunk/SkimNotes/SkimNotes.rtf 2023-12-04 10:16:59 UTC (rev 13823)
@@ -170,7 +170,7 @@
\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
\f1\fs24 \cf0 \CocoaLigature1 \
-The code does not support deployment targets lower than 10.6 currently. When
building using older Xcode versions, also the nullability qualifiers and macros
in the headers may have to be removed.\
+The code does not support deployment targets lower than 10.6 currently.\
\
Also you may want to support older architectures by changing the
\f3\fs22 \CocoaLigature0 ARCHS
Modified: trunk/SkimNotes/SkimNotesBase_Prefix.pch
===================================================================
--- trunk/SkimNotes/SkimNotesBase_Prefix.pch 2023-12-03 23:46:26 UTC (rev
13822)
+++ trunk/SkimNotes/SkimNotesBase_Prefix.pch 2023-12-04 10:16:59 UTC (rev
13823)
@@ -12,4 +12,13 @@
#endif
#define SKNLocalizedString(key, comment)
NSLocalizedStringFromTableInBundle(key, @"SkimNotes", [NSBundle
bundleWithIdentifier:@"net.sourceforge.skim-app.framework.SkimNotesBase"],
comment)
+
+#if !defined(__clang__) || !__has_feature(nullability)
+ #define NS_ASSUME_NONNULL_BEGIN
+ #define NS_ASSUME_NONNULL_END
+ #define _Nullable
+ #define nullable
+#elif __clang_major__==6
+ #define _Nullable __nullable
#endif
+#endif
Modified: trunk/SkimNotes/SkimNotes_Prefix.pch
===================================================================
--- trunk/SkimNotes/SkimNotes_Prefix.pch 2023-12-03 23:46:26 UTC (rev
13822)
+++ trunk/SkimNotes/SkimNotes_Prefix.pch 2023-12-04 10:16:59 UTC (rev
13823)
@@ -7,4 +7,13 @@
#import <PDFKit/PDFKit.h>
#define SKNLocalizedString(key, comment)
NSLocalizedStringFromTableInBundle(key, @"SkimNotes", [NSBundle
bundleWithIdentifier:@"net.sourceforge.skim-app.framework.SkimNotes"], comment)
+
+#if !defined(__clang__) || !__has_feature(nullability)
+ #define NS_ASSUME_NONNULL_BEGIN
+ #define NS_ASSUME_NONNULL_END
+ #define _Nullable
+ #define nullable
+#elif __clang_major__==6
+ #define _Nullable __nullable
#endif
+#endif
Modified: trunk/SkimNotes/SkimNotes_Tool_Prefix.pch
===================================================================
--- trunk/SkimNotes/SkimNotes_Tool_Prefix.pch 2023-12-03 23:46:26 UTC (rev
13822)
+++ trunk/SkimNotes/SkimNotes_Tool_Prefix.pch 2023-12-04 10:16:59 UTC (rev
13823)
@@ -7,4 +7,13 @@
#import <AppKit/AppKit.h>
#define SKNLocalizedString(key, comment) key
+
+#if !defined(__clang__) || !__has_feature(nullability)
+ #define NS_ASSUME_NONNULL_BEGIN
+ #define NS_ASSUME_NONNULL_END
+ #define _Nullable
+ #define nullable
+#elif __clang_major__==6
+ #define _Nullable __nullable
#endif
+#endif
Modified: trunk/SkimNotes/SkimPDF_Tool_Prefix.pch
===================================================================
--- trunk/SkimNotes/SkimPDF_Tool_Prefix.pch 2023-12-03 23:46:26 UTC (rev
13822)
+++ trunk/SkimNotes/SkimPDF_Tool_Prefix.pch 2023-12-04 10:16:59 UTC (rev
13823)
@@ -8,4 +8,13 @@
#import <PDFKit/PDFKit.h>
#define SKNLocalizedString(key, comment) key
+
+#if !defined(__clang__) || !__has_feature(nullability)
+ #define NS_ASSUME_NONNULL_BEGIN
+ #define NS_ASSUME_NONNULL_END
+ #define _Nullable
+ #define nullable
+#elif __clang_major__==6
+ #define _Nullable __nullable
#endif
+#endif
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
