[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[weinig at apple.com]

The following commit has been merged in the debian/experimental branch:
commit cfcecdd80b307503f72c098f4704c5f391f9c944
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 9 19:41:53 2010 +0000

    Fix windows build.
    
    * WebProcess/win/WebProcessWin.cpp:
    (WebKit::WebProcess::platformSetCacheModel):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71662 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 5e6df3d..2bad18b 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,12 @@
 2010-11-09  Sam Weinig  <sam at webkit.org>
 
+        Fix windows build.
+
+        * WebProcess/win/WebProcessWin.cpp:
+        (WebKit::WebProcess::platformSetCacheModel):
+
+2010-11-09  Sam Weinig  <sam at webkit.org>
+
         Reviewed by Adam Roben.
 
         Factor calculation of cache sizes based on cache model into shared function
diff --git a/WebKit2/WebProcess/win/WebProcessWin.cpp b/WebKit2/WebProcess/win/WebProcessWin.cpp
index 1ff1d1f..f8a443f 100644
--- a/WebKit2/WebProcess/win/WebProcessWin.cpp
+++ b/WebKit2/WebProcess/win/WebProcessWin.cpp
@@ -91,7 +91,7 @@ void WebProcess::platformSetCacheModel(CacheModel cacheModel)
 
     RetainPtr<CFURLCacheRef> cfurlCache(AdoptCF, CFURLCacheCopySharedURLCache());
     CFURLCacheSetMemoryCapacity(cfurlCache.get(), urlCacheMemoryCapacity);
-    CFURLCacheSetDiskCapacity(cfurlCache.get(), max(urlCacheDiskCapacity, CFURLCacheDiskCapacity(cfurlCache.get()))); // Don't shrink a big disk cache, since that would cause churn.
+    CFURLCacheSetDiskCapacity(cfurlCache.get(), max<unsigned long>(urlCacheDiskCapacity, CFURLCacheDiskCapacity(cfurlCache.get()))); // Don't shrink a big disk cache, since that would cause churn.
 #endif
 }
 

-- 
WebKit Debian packaging