Diff
Modified: trunk/Source/WebCore/PAL/ChangeLog (233326 => 233327)
--- trunk/Source/WebCore/PAL/ChangeLog 2018-06-28 21:15:48 UTC (rev 233326)
+++ trunk/Source/WebCore/PAL/ChangeLog 2018-06-28 21:21:41 UTC (rev 233327)
@@ -1,3 +1,15 @@
+2018-06-28 Jonathan Bedard <[email protected]>
+
+ Build fix (2) after r233266
+ https://bugs.webkit.org/show_bug.cgi?id=187024
+ <rdar://problem/39759057>
+
+ Unreviewed build fix.
+
+ * pal/cf/CoreMediaSoftLink.cpp: Distinguish between IOS and MINIMAL_SIMULATOR.
+ * pal/cf/CoreMediaSoftLink.h: Ditto.
+ * pal/spi/cocoa/LaunchServicesSPI.h: LSApplicationProxy should be conditionalized on HAVE(APP_LINKS).
+
2018-06-27 Jonathan Bedard <[email protected]>
Build fix after r233266
Modified: trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp (233326 => 233327)
--- trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp 2018-06-28 21:15:48 UTC (rev 233326)
+++ trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp 2018-06-28 21:21:41 UTC (rev 233327)
@@ -159,7 +159,7 @@
SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, CoreMedia, CMClockGetHostTimeClock, CMClockRef, (void), ())
SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, CoreMedia, CMClockGetTime, CMTime, (CMClockRef clock), (clock))
-#if PLATFORM(APPLETV) || PLATFORM(MAC) || PLATFORM(WATCHOS) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED < 120000)
+#if PLATFORM(APPLETV) || PLATFORM(MAC) || ENABLE(MINIMAL_SIMULATOR) || PLATFORM(WATCHOS) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED < 120000)
SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, CoreMedia, CMSampleBufferCallForEachSample, OSStatus, (CMSampleBufferRef sbuf, OSStatus (* CMSAMPLEBUFFERCALL_NOESCAPE callback)( CMSampleBufferRef sampleBuffer, CMItemCount index, void *refcon), void *refcon), (sbuf, callback, refcon))
SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, CoreMedia, CMSampleBufferCallBlockForEachSample, OSStatus, (CMSampleBufferRef sbuf, OSStatus (^ CMSAMPLEBUFFERCALL_NOESCAPE handler)(CMSampleBufferRef, CMItemCount)), (sbuf, handler))
#endif
Modified: trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h (233326 => 233327)
--- trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h 2018-06-28 21:15:48 UTC (rev 233326)
+++ trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h 2018-06-28 21:21:41 UTC (rev 233327)
@@ -268,7 +268,7 @@
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, CoreMedia, CMClockGetTime, CMTime, (CMClockRef clock), (clock))
#define CMClockGetTime softLink_CoreMedia_CMClockGetTime
-#if PLATFORM(APPLETV) || PLATFORM(MAC) || PLATFORM(WATCHOS) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED < 120000)
+#if PLATFORM(APPLETV) || PLATFORM(MAC) || ENABLE(MINIMAL_SIMULATOR) || PLATFORM(WATCHOS) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED < 120000)
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, CoreMedia, CMSampleBufferCallForEachSample, OSStatus, (CMSampleBufferRef sbuf, OSStatus (* CMSAMPLEBUFFERCALL_NOESCAPE callback)( CMSampleBufferRef sampleBuffer, CMItemCount index, void *refcon), void *refcon), (sbuf, callback, refcon))
#define CMSampleBufferCallForEachSample softLink_CoreMedia_CMSampleBufferCallForEachSample
Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h (233326 => 233327)
--- trunk/Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h 2018-06-28 21:15:48 UTC (rev 233326)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h 2018-06-28 21:21:41 UTC (rev 233327)
@@ -51,11 +51,11 @@
@interface LSBundleProxy : LSResourceProxy <NSSecureCoding>
@end
+#if HAVE(APP_LINKS)
@interface LSApplicationProxy : LSBundleProxy <NSSecureCoding>
- (NSString *)localizedNameForContext:(NSString *)context;
@end
-#if HAVE(APP_LINKS)
@interface LSAppLink : NSObject <NSSecureCoding>
@end
