[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[ap at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 1eaaa64382aaab2bd96e844075565d35e884f4b8
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 27 06:39:31 2010 +0000

            More Windows build fixing.
    
            * wtf/HashTraits.h: _msize takes void*, remove const qualifier from type.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53903 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 842c348..93302a4 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,11 @@
 2010-01-26  Alexey Proskuryakov  <ap at apple.com>
 
+        More Windows build fixing.
+
+        * wtf/HashTraits.h: _msize takes void*, remove const qualifier from type.
+
+2010-01-26  Alexey Proskuryakov  <ap at apple.com>
+
         Windows build fix.
 
         * wtf/HashTraits.h: Include malloc.h for _msize().
diff --git a/JavaScriptCore/wtf/HashTraits.h b/JavaScriptCore/wtf/HashTraits.h
index 28e6a7a..96ecac9 100644
--- a/JavaScriptCore/wtf/HashTraits.h
+++ b/JavaScriptCore/wtf/HashTraits.h
@@ -94,7 +94,7 @@ namespace WTF {
 #if OS(DARWIN)
             ASSERT(malloc_size(p));
 #elif COMPILER(MSVC)
-            ASSERT(_msize(p));
+            ASSERT(_msize(const_cast<P*>(p)));
 #endif
 #endif
             HashTraits<P>::checkValueConsistency(*p);

-- 
WebKit Debian packaging