[webkit-changes] [233283] trunk/Source/WebCore/PAL

Wed, 27 Jun 2018 15:50:29 -0700

Title: [233283] trunk/Source/WebCore/PAL
Revision
233283
Author
[email protected]
Date
2018-06-27 15:49:20 -0700 (Wed, 27 Jun 2018)

Log Message

Build fix after r233266 
https://bugs.webkit.org/show_bug.cgi?id=187024
<rdar://problem/39759057>

Unreviewed build fix.

* pal/cf/CoreMediaSoftLink.cpp: Do not soft-link CMSampleBufferCallForEachSample for
iOS 12 and up on iPhone device and simulator.
* pal/cf/CoreMediaSoftLink.h: Ditto.

Modified Paths

Diff

Modified: trunk/Source/WebCore/PAL/ChangeLog (233282 => 233283)


--- trunk/Source/WebCore/PAL/ChangeLog	2018-06-27 22:43:33 UTC (rev 233282)
+++ trunk/Source/WebCore/PAL/ChangeLog	2018-06-27 22:49:20 UTC (rev 233283)
@@ -1,5 +1,17 @@
 2018-06-27  Jonathan Bedard  <[email protected]>
 
+        Build fix after r233266 
+        https://bugs.webkit.org/show_bug.cgi?id=187024
+        <rdar://problem/39759057>
+
+        Unreviewed build fix.
+
+        * pal/cf/CoreMediaSoftLink.cpp: Do not soft-link CMSampleBufferCallForEachSample for
+        iOS 12 and up on iPhone device and simulator.
+        * pal/cf/CoreMediaSoftLink.h: Ditto.
+
+2018-06-27  Jonathan Bedard  <[email protected]>
+
         Enable WebKit iOS 12 build
         https://bugs.webkit.org/show_bug.cgi?id=187024
         <rdar://problem/39759057>

Modified: trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp (233282 => 233283)


--- trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp	2018-06-27 22:43:33 UTC (rev 233282)
+++ trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp	2018-06-27 22:49:20 UTC (rev 233283)
@@ -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(IOS) || __IPHONE_OS_VERSION_MAX_ALLOWED < 120000
+#if PLATFORM(APPLETV) || PLATFORM(MAC) || 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 (233282 => 233283)


--- trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h	2018-06-27 22:43:33 UTC (rev 233282)
+++ trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h	2018-06-27 22:49:20 UTC (rev 233283)
@@ -268,7 +268,7 @@
 SOFT_LINK_FUNCTION_FOR_HEADER(PAL, CoreMedia, CMClockGetTime, CMTime, (CMClockRef clock), (clock))
 #define CMClockGetTime  softLink_CoreMedia_CMClockGetTime
 
-#if !PLATFORM(IOS) || __IPHONE_OS_VERSION_MAX_ALLOWED < 120000
+#if PLATFORM(APPLETV) || PLATFORM(MAC) || 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

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to