Windows build fix
authoraroben@apple.com <aroben@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Oct 2010 07:21:25 +0000 (07:21 +0000)
committeraroben@apple.com <aroben@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Oct 2010 07:21:25 +0000 (07:21 +0000)
* win/include/WebKitSystemInterface/WebKitSystemInterface.h:
* win/lib/WebKitSystemInterface.lib:
* win/lib/WebKitSystemInterface_debug.lib:
Use a WKCFURLCredentialRef type to protect against changes to the
definition of CFURLCredentialRef.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@70131 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKitLibraries/ChangeLog
WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
WebKitLibraries/win/lib/WebKitSystemInterface.lib
WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib

index 2cb7181..e15958d 100644 (file)
@@ -1,3 +1,13 @@
+2010-10-20  Adam Roben  <aroben@apple.com>
+
+        Windows build fix
+
+        * win/include/WebKitSystemInterface/WebKitSystemInterface.h:
+        * win/lib/WebKitSystemInterface.lib:
+        * win/lib/WebKitSystemInterface_debug.lib:
+        Use a WKCFURLCredentialRef type to protect against changes to the
+        definition of CFURLCredentialRef.
+
 2010-10-19  Adam Roben  <aroben@apple.com>
 
         Windows build fix
index 7db7342..a87cfb6 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef WebKitSystemInterface_h
 #define WebKitSystemInterface_h
 
-#include <CFNetwork/CFURLCredentialPriv.h>
-
 struct CGAffineTransform;
 struct CGPoint;
 struct CGRect;
@@ -63,6 +61,7 @@ typedef CVBufferRef CVImageBufferRef;
 typedef CVImageBufferRef CVPixelBufferRef;
 typedef struct _CAImageQueue *CAImageQueueRef;
 typedef unsigned long CFTypeID;
+typedef struct _CFURLCredential* WKCFURLCredentialRef;
 
 void wkSetFontSmoothingLevel(int type);
 int wkGetFontSmoothingLevel();
@@ -99,7 +98,7 @@ void wkSetCONNECTProxyForStream(CFReadStreamRef, CFStringRef proxyHost, CFNumber
 void wkSetCONNECTProxyAuthorizationForStream(CFReadStreamRef, CFStringRef proxyAuthorizationString);
 CFHTTPMessageRef wkCopyCONNECTProxyResponse(CFReadStreamRef, CFURLRef responseURL);
 
-CFURLCredentialRef wkCopyCredentialFromCFPersistentStorage(CFURLProtectionSpaceRef protectionSpace);
+WKCFURLCredentialRef wkCopyCredentialFromCFPersistentStorage(CFURLProtectionSpaceRef protectionSpace);
 
 CFStringRef wkCFNetworkErrorGetLocalizedDescription(CFIndex errorCode);
 
index c23ae49..6e2018b 100644 (file)
Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface.lib differ
index ddcbeee..b9f1433 100644 (file)
Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib differ