Title: [175313] branches/safari-600.3-branch/Source/WTF
- Revision
- 175313
- Author
- [email protected]
- Date
- 2014-10-29 01:00:01 -0700 (Wed, 29 Oct 2014)
Log Message
Partial merge of r172749. rdar://problem/18757166
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WTF/ChangeLog (175312 => 175313)
--- branches/safari-600.3-branch/Source/WTF/ChangeLog 2014-10-29 07:58:59 UTC (rev 175312)
+++ branches/safari-600.3-branch/Source/WTF/ChangeLog 2014-10-29 08:00:01 UTC (rev 175313)
@@ -1,3 +1,12 @@
+2014-10-29 Lucas Forschler <[email protected]>
+
+ Merge parts of 172749 for rdar://problem/18757166
+ Partially merged to make SPI headers work correctly on the branch
+
+ Reviewed by Tim Horton.
+
+ * wtf/Platform.h:
+
2014-09-13 Babak Shafiei <[email protected]>
Merge r173595
Modified: branches/safari-600.3-branch/Source/WTF/wtf/Platform.h (175312 => 175313)
--- branches/safari-600.3-branch/Source/WTF/wtf/Platform.h 2014-10-29 07:58:59 UTC (rev 175312)
+++ branches/safari-600.3-branch/Source/WTF/wtf/Platform.h 2014-10-29 08:00:01 UTC (rev 175313)
@@ -1043,6 +1043,12 @@
#define WTF_USE_ASYNC_NSTEXTINPUTCLIENT 1
#endif
+#if PLATFORM(COCOA)
+#if defined __has_include && __has_include(<CoreFoundation/CFPriv.h>)
+#define WTF_USE_APPLE_INTERNAL_SDK 1
+#endif
+#endif
+
#if (OS(DARWIN) && USE(CG)) || USE(FREETYPE) || (PLATFORM(WIN) && (USE(CG) || USE(CAIRO)))
#undef ENABLE_OPENTYPE_MATH
#define ENABLE_OPENTYPE_MATH 1
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
