Revision: 13824
http://sourceforge.net/p/skim-app/code/13824
Author: hofman
Date: 2023-12-04 14:52:23 +0000 (Mon, 04 Dec 2023)
Log Message:
-----------
revert previous commit, don't conditionally define nullability qualifiers
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-04 10:16:59 UTC (rev 13823)
+++ trunk/SkimNotes/SkimNotes.rtf 2023-12-04 14:52:23 UTC (rev 13824)
@@ -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.\
+The code does not support deployment targets lower than 10.6 currently.
However, for older compiler versions the nullability qualifiers and macros way
need to be removed.\
\
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-04 10:16:59 UTC (rev
13823)
+++ trunk/SkimNotes/SkimNotesBase_Prefix.pch 2023-12-04 14:52:23 UTC (rev
13824)
@@ -12,13 +12,4 @@
#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-04 10:16:59 UTC (rev
13823)
+++ trunk/SkimNotes/SkimNotes_Prefix.pch 2023-12-04 14:52:23 UTC (rev
13824)
@@ -7,13 +7,4 @@
#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-04 10:16:59 UTC (rev
13823)
+++ trunk/SkimNotes/SkimNotes_Tool_Prefix.pch 2023-12-04 14:52:23 UTC (rev
13824)
@@ -7,13 +7,4 @@
#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-04 10:16:59 UTC (rev
13823)
+++ trunk/SkimNotes/SkimPDF_Tool_Prefix.pch 2023-12-04 14:52:23 UTC (rev
13824)
@@ -8,13 +8,4 @@
#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
