[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 e3e20b0b5dfc2545ffabd266828827f4865be899
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 9 22:20:22 2010 +0000

    Fix mac build.
    
    * WebProcess/mac/WebProcessMac.mm:
    (WebKit::WebProcess::platformSetCacheModel):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71677 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 5511818..b369f8b 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-09  Sam Weinig  <sam at webkit.org>
+
+        Fix mac build.
+
+        * WebProcess/mac/WebProcessMac.mm:
+        (WebKit::WebProcess::platformSetCacheModel):
+
 2010-11-09  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Darin Adler, Dan Bernstein.
diff --git a/WebKit2/WebProcess/mac/WebProcessMac.mm b/WebKit2/WebProcess/mac/WebProcessMac.mm
index d117f1f..387d521 100644
--- a/WebKit2/WebProcess/mac/WebProcessMac.mm
+++ b/WebKit2/WebProcess/mac/WebProcessMac.mm
@@ -93,7 +93,7 @@ void WebProcess::platformSetCacheModel(CacheModel cacheModel)
 
     NSURLCache *nsurlCache = [NSURLCache sharedURLCache];
     [nsurlCache setMemoryCapacity:urlCacheMemoryCapacity];
-    [nsurlCache setDiskCapacity:max(urlCacheDiskCapacity, [nsurlCache diskCapacity])]; // Don't shrink a big disk cache, since that would cause churn.
+    [nsurlCache setDiskCapacity:max<unsigned long>(urlCacheDiskCapacity, [nsurlCache diskCapacity])]; // Don't shrink a big disk cache, since that would cause churn.
 }
 
 } // namespace WebKit

-- 
WebKit Debian packaging