Title: [152503] branches/safari-537-branch/Source/WebCore
- Revision
- 152503
- Author
- [email protected]
- Date
- 2013-07-09 11:14:53 -0700 (Tue, 09 Jul 2013)
Log Message
Merged r152383. <rdar://problem/14351106>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (152502 => 152503)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-09 18:07:10 UTC (rev 152502)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-09 18:14:53 UTC (rev 152503)
@@ -1,5 +1,19 @@
2013-07-09 Lucas Forschler <[email protected]>
+ Merge r152383
+
+ 2013-07-03 Brent Fulgham <[email protected]>
+
+ [Windows] Updates to support changes in CoreGraphics libraries.
+ https://bugs.webkit.org/show_bug.cgi?id=118373
+
+ Reviewed by Anders Carlsson.
+
+ * WebCorePrefix.h: Include definitions for isnan/round/roundf for versions of
+ Visual Studio that do not provide them natively.
+
+2013-07-09 Lucas Forschler <[email protected]>
+
Merge r152382
2013-07-03 Gordon Sheridan <[email protected]>
Modified: branches/safari-537-branch/Source/WebCore/WebCorePrefix.h (152502 => 152503)
--- branches/safari-537-branch/Source/WebCore/WebCorePrefix.h 2013-07-09 18:07:10 UTC (rev 152502)
+++ branches/safari-537-branch/Source/WebCore/WebCorePrefix.h 2013-07-09 18:14:53 UTC (rev 152503)
@@ -136,6 +136,19 @@
#if OS(WINDOWS)
#if USE(CG)
+
+#if defined(_MSC_VER) && _MSC_VER <= 1600
+// These must be defined before including CGFloat.h
+// This can be removed once we move to VS2012 or newer
+#include <wtf/ExportMacros.h>
+#include <wtf/MathExtras.h>
+
+#define isnan _isnan
+#include <CoreGraphics/CoreGraphics.h>
+#include <CoreGraphics/CGFloat.h>
+#undef isnan
+#endif
+
// FIXME <rdar://problem/8208868> Remove support for obsolete ColorSync API, CoreServices header in CoreGraphics
// We can remove this once the new ColorSync APIs are available in an internal Safari SDK.
#include <ColorSync/ColorSync.h>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
