Title: [171857] trunk/Source/WebCore
- Revision
- 171857
- Author
- m...@apple.com
- Date
- 2014-07-31 09:41:40 -0700 (Thu, 31 Jul 2014)
Log Message
Tried to fix building with the OS X 10.9 SDK while targeting OS X 10.8.
* platform/network/cocoa/CredentialCocoa.mm:
(WebCore::toCredentialPersistence):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (171856 => 171857)
--- trunk/Source/WebCore/ChangeLog 2014-07-31 16:24:02 UTC (rev 171856)
+++ trunk/Source/WebCore/ChangeLog 2014-07-31 16:41:40 UTC (rev 171857)
@@ -1,5 +1,12 @@
2014-07-31 Dan Bernstein <m...@apple.com>
+ Tried to fix building with the OS X 10.9 SDK while targeting OS X 10.8.
+
+ * platform/network/cocoa/CredentialCocoa.mm:
+ (WebCore::toCredentialPersistence):
+
+2014-07-31 Dan Bernstein <m...@apple.com>
+
Reverted r171854, because it broke building with the OS X 10.8 SDK.
* platform/network/cocoa/CredentialCocoa.mm:
Modified: trunk/Source/WebCore/platform/network/cocoa/CredentialCocoa.mm (171856 => 171857)
--- trunk/Source/WebCore/platform/network/cocoa/CredentialCocoa.mm 2014-07-31 16:24:02 UTC (rev 171856)
+++ trunk/Source/WebCore/platform/network/cocoa/CredentialCocoa.mm 2014-07-31 16:41:40 UTC (rev 171857)
@@ -26,6 +26,13 @@
#import "config.h"
#import "CredentialCocoa.h"
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED == 1080
+// This value is available in OS X 10.8 but only appeared in the OS X 10.9 SDK.
+enum {
+ NSURLCredentialPersistenceSynchronizable = 3
+};
+#endif
+
#if USE(CFNETWORK)
@interface NSURLCredential (WebDetails)
- (id)_initWithCFURLCredential:(CFURLCredentialRef)credential;
@@ -58,8 +65,13 @@
case NSURLCredentialPersistenceForSession:
return CredentialPersistenceForSession;
case NSURLCredentialPersistencePermanent:
-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED == 1080
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wswitch"
+#endif
case NSURLCredentialPersistenceSynchronizable:
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED == 1080
+#pragma clang diagnostic pop
#endif
return CredentialPersistencePermanent;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
