Title: [282665] trunk/Source/WebCore/PAL
- Revision
- 282665
- Author
- [email protected]
- Date
- 2021-09-17 10:13:34 -0700 (Fri, 17 Sep 2021)
Log Message
[Mac Catalyst] Fix build issue
https://bugs.webkit.org/show_bug.cgi?id=230373
Reviewed by Darin Adler.
There's an issue with the Mac Catalyst build where LSSessionID is being redefined. Address this by removing the second definition,
and moving the related function into the open source section.
* pal/spi/cocoa/LaunchServicesSPI.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/PAL/ChangeLog (282664 => 282665)
--- trunk/Source/WebCore/PAL/ChangeLog 2021-09-17 15:58:10 UTC (rev 282664)
+++ trunk/Source/WebCore/PAL/ChangeLog 2021-09-17 17:13:34 UTC (rev 282665)
@@ -1,3 +1,15 @@
+2021-09-17 Per Arne Vollan <[email protected]>
+
+ [Mac Catalyst] Fix build issue
+ https://bugs.webkit.org/show_bug.cgi?id=230373
+
+ Reviewed by Darin Adler.
+
+ There's an issue with the Mac Catalyst build where LSSessionID is being redefined. Address this by removing the second definition,
+ and moving the related function into the open source section.
+
+ * pal/spi/cocoa/LaunchServicesSPI.h:
+
2021-09-16 Tim Horton <[email protected]>
Adjust ARKIT_INLINE_PREVIEW* compile time flags
Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h (282664 => 282665)
--- trunk/Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h 2021-09-17 15:58:10 UTC (rev 282664)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h 2021-09-17 17:13:34 UTC (rev 282665)
@@ -79,6 +79,13 @@
enum {
kLSServerConnectionStatusDoNotConnectToServerMask = 0x1ULL,
};
+
+WTF_EXTERN_C_BEGIN
+
+CFDictionaryRef _LSApplicationCheckIn(LSSessionID, CFDictionaryRef applicationInfo);
+
+WTF_EXTERN_C_END
+
#endif
#if HAVE(LSDATABASECONTEXT)
@@ -125,17 +132,10 @@
#if PLATFORM(MAC) || PLATFORM(MACCATALYST)
-#if PLATFORM(MACCATALYST) && USE(APPLE_INTERNAL_SDK)
-enum LSSessionID {
- kLSDefaultSessionID = -2,
-};
-#endif
-
WTF_EXTERN_C_BEGIN
typedef bool (^LSServerConnectionAllowedBlock) (CFDictionaryRef optionsRef);
void _LSSetApplicationLaunchServicesServerConnectionStatus(uint64_t flags, LSServerConnectionAllowedBlock block);
-CFDictionaryRef _LSApplicationCheckIn(LSSessionID sessionID, CFDictionaryRef applicationInfo);
WTF_EXTERN_C_END
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
