Title: [122671] trunk/Source/WebCore
- Revision
- 122671
- Author
- [email protected]
- Date
- 2012-07-14 14:34:10 -0700 (Sat, 14 Jul 2012)
Log Message
Fix the Windows build.
* platform/network/cf/DNSCFNet.cpp: Fix the condition to take Windows in to account.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (122670 => 122671)
--- trunk/Source/WebCore/ChangeLog 2012-07-14 21:11:56 UTC (rev 122670)
+++ trunk/Source/WebCore/ChangeLog 2012-07-14 21:34:10 UTC (rev 122671)
@@ -1,5 +1,11 @@
2012-07-14 Mark Rowe <[email protected]>
+ Fix the Windows build.
+
+ * platform/network/cf/DNSCFNet.cpp: Fix the condition to take Windows in to account.
+
+2012-07-14 Mark Rowe <[email protected]>
+
Make it explicit which code paths iOS should use when doing checks based on OS X versions.
Rubber-stamped by David Kilzer.
Modified: trunk/Source/WebCore/platform/network/cf/DNSCFNet.cpp (122670 => 122671)
--- trunk/Source/WebCore/platform/network/cf/DNSCFNet.cpp 2012-07-14 21:11:56 UTC (rev 122670)
+++ trunk/Source/WebCore/platform/network/cf/DNSCFNet.cpp 2012-07-14 21:34:10 UTC (rev 122671)
@@ -42,7 +42,7 @@
#include <CFNetwork/CFNetwork.h>
#endif
-#if !PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
+#if PLATFORM(MAC) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
#include <SystemConfiguration/SystemConfiguration.h>
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
