Changeset 207136 in webkit

Timestamp:

Oct 11, 2016 7:09:51 AM (8 years ago)

Author:

pvollan@apple.com

Message:

[Win] Compile fix.
​https://bugs.webkit.org/show_bug.cgi?id=163272

Reviewed by Brent Fulgham.

When compiling with older SDKs, some CoreText symbols are redefined.
This patch checks if the relevant CoreText header file has been
included before defining the symbol.

• platform/spi/win/CoreTextSPIWin.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/spi/win/CoreTextSPIWin.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-11  Per Arne Vollan  <pvollan@apple.com>
+
+        [Win] Compile fix.
+        https://bugs.webkit.org/show_bug.cgi?id=163272
+
+        Reviewed by Brent Fulgham.
+
+        When compiling with older SDKs, some CoreText symbols are redefined.
+        This patch checks if the relevant CoreText header file has been
+        included before defining the symbol.
+
+        * platform/spi/win/CoreTextSPIWin.h:
+
 2016-10-11  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/platform/spi/win/CoreTextSPIWin.h

@@ -28 +28 @@
 #include <CoreFoundation/CoreFoundation.h>
 #include <CoreGraphics/CoreGraphics.h>
-#include <CoreText/CTDefines.h>
-#include <CoreText/CTFontDescriptor.h>
+#include <CoreText/CoreText.h>
 
 WTF_EXTERN_C_BEGIN
@@ -41 +40 @@
 CT_EXPORT const CFStringRef kCTForegroundColorFromContextAttributeName;
 
+// This enum is defined in CTFont.h. To avoid redefinition, only define it here if CTFont.h has not been included. 
+#ifndef __CTFONT__
 typedef CF_OPTIONS(uint32_t, CTFontTableOptions)
 {
@@ -46 +47 @@
     kCTFontTableOptionExcludeSynthetic = (1 << 0)
 };
+#endif
 
 CTFontRef CTFontCreateWithName(CFStringRef, CGFloat size, const CGAffineTransform*);