Title: [181055] trunk/Source/WebCore
- Revision
- 181055
- Author
- [email protected]
- Date
- 2015-03-04 17:19:57 -0800 (Wed, 04 Mar 2015)
Log Message
[Windows] Build fix: Make sure to include <CoreMedia/CoreMedia.h> before redefining CMSampleBuffer
More fallout from:
Switch remaining CoreMedia soft-linking in WebCore over to CoreMediaSoftLink.{cpp,h}
<http://webkit.org/b/141870>
* platform/cf/CoreMediaSoftLink.cpp:
* platform/cf/CoreMediaSoftLink.h:
- Remove include of <CoreMedia/CoreMedia.h> here. These already
include CoreMediaSPI.h.
* platform/spi/cf/CoreMediaSPI.h:
- Add include of <CoreMedia/CoreMedia.h> here.
- Remove redundant include of <CoreMedia/CMTime.h> for Windows.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (181054 => 181055)
--- trunk/Source/WebCore/ChangeLog 2015-03-05 01:18:41 UTC (rev 181054)
+++ trunk/Source/WebCore/ChangeLog 2015-03-05 01:19:57 UTC (rev 181055)
@@ -1,5 +1,22 @@
2015-03-04 David Kilzer <[email protected]>
+ [Windows] Build fix: Make sure to include <CoreMedia/CoreMedia.h> before redefining CMSampleBuffer
+
+ More fallout from:
+
+ Switch remaining CoreMedia soft-linking in WebCore over to CoreMediaSoftLink.{cpp,h}
+ <http://webkit.org/b/141870>
+
+ * platform/cf/CoreMediaSoftLink.cpp:
+ * platform/cf/CoreMediaSoftLink.h:
+ - Remove include of <CoreMedia/CoreMedia.h> here. These already
+ include CoreMediaSPI.h.
+ * platform/spi/cf/CoreMediaSPI.h:
+ - Add include of <CoreMedia/CoreMedia.h> here.
+ - Remove redundant include of <CoreMedia/CMTime.h> for Windows.
+
+2015-03-04 David Kilzer <[email protected]>
+
[iOS] Fix build with newer clang due to duplicate macro definition
Fallout from:
Modified: trunk/Source/WebCore/platform/cf/CoreMediaSoftLink.cpp (181054 => 181055)
--- trunk/Source/WebCore/platform/cf/CoreMediaSoftLink.cpp 2015-03-05 01:18:41 UTC (rev 181054)
+++ trunk/Source/WebCore/platform/cf/CoreMediaSoftLink.cpp 2015-03-05 01:19:57 UTC (rev 181055)
@@ -29,7 +29,6 @@
#include "CoreMediaSPI.h"
#include "SoftLinking.h"
-#include <CoreMedia/CoreMedia.h>
SOFT_LINK_FRAMEWORK_SOURCE(WebCore, CoreMedia)
Modified: trunk/Source/WebCore/platform/cf/CoreMediaSoftLink.h (181054 => 181055)
--- trunk/Source/WebCore/platform/cf/CoreMediaSoftLink.h 2015-03-05 01:18:41 UTC (rev 181054)
+++ trunk/Source/WebCore/platform/cf/CoreMediaSoftLink.h 2015-03-05 01:19:57 UTC (rev 181055)
@@ -30,7 +30,6 @@
#include "CoreMediaSPI.h"
#include "SoftLinking.h"
-#include <CoreMedia/CoreMedia.h>
SOFT_LINK_FRAMEWORK_HEADER(WebCore, CoreMedia)
Modified: trunk/Source/WebCore/platform/spi/cf/CoreMediaSPI.h (181054 => 181055)
--- trunk/Source/WebCore/platform/spi/cf/CoreMediaSPI.h 2015-03-05 01:18:41 UTC (rev 181054)
+++ trunk/Source/WebCore/platform/spi/cf/CoreMediaSPI.h 2015-03-05 01:19:57 UTC (rev 181055)
@@ -26,6 +26,8 @@
#ifndef CoreMediaSPI_h
#define CoreMediaSPI_h
+#include <CoreMedia/CoreMedia.h>
+
#if PLATFORM(COCOA)
#if USE(APPLE_INTERNAL_SDK)
@@ -44,7 +46,6 @@
#endif // PLATFORM(COCOA)
#if PLATFORM(WIN)
-#include <CoreMedia/CMTime.h>
typedef struct OpaqueCMBlockBuffer* CMBlockBufferRef;
typedef const struct opaqueCMFormatDescription* CMFormatDescriptionRef;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
