[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 8c5f54c82ff491d0a792841abab7e2d0fc0f70c6
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 27 06:22:24 2010 +0000

            Windows build fix.
    
            * wtf/HashTraits.h: Include malloc.h for _msize().
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53902 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 861fbea..842c348 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,11 @@
 2010-01-26  Alexey Proskuryakov  <ap at apple.com>
 
+        Windows build fix.
+
+        * wtf/HashTraits.h: Include malloc.h for _msize().
+
+2010-01-26  Alexey Proskuryakov  <ap at apple.com>
+
         Build fix.
 
         * wtf/HashTable.h: (WTF::HashTable::checkTableConsistencyExceptSize): Remove const from a
diff --git a/JavaScriptCore/wtf/HashTraits.h b/JavaScriptCore/wtf/HashTraits.h
index a82895c..28e6a7a 100644
--- a/JavaScriptCore/wtf/HashTraits.h
+++ b/JavaScriptCore/wtf/HashTraits.h
@@ -26,8 +26,11 @@
 #include <utility>
 #include <limits>
 
+// For malloc_size and _msize.
 #if OS(DARWIN)
 #include <malloc/malloc.h>
+#elif COMPILER(MSVC)
+#include <malloc.h>
 #endif
 
 namespace WTF {

-- 
WebKit Debian packaging