[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[ggaren at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 1d940004ae83ed30a9d111e0c01fd9db32497c73
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 9 05:15:52 2010 +0000

    Windows build fix: 'P' is not a type. Luckily, 'void' is.
    
    * wtf/FastMalloc.cpp:
    (WTF::fastCheckConsistency):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55708 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 2d78d92..df04336 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,12 @@
 2010-03-08  Geoffrey Garen  <ggaren at apple.com>
 
+        Windows build fix: 'P' is not a type. Luckily, 'void' is.
+
+        * wtf/FastMalloc.cpp:
+        (WTF::fastCheckConsistency):
+
+2010-03-08  Geoffrey Garen  <ggaren at apple.com>
+
         Windows build fix: export a new symbol.
 
         * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
diff --git a/JavaScriptCore/wtf/FastMalloc.cpp b/JavaScriptCore/wtf/FastMalloc.cpp
index 0ec5bbc..a40a9b2 100644
--- a/JavaScriptCore/wtf/FastMalloc.cpp
+++ b/JavaScriptCore/wtf/FastMalloc.cpp
@@ -385,7 +385,7 @@ void fastCheckConsistency(const void* p)
 #if OS(DARWIN)
         ASSERT(malloc_size(p));
 #elif COMPILER(MSVC)
-        ASSERT(_msize(const_cast<P*>(p)));
+        ASSERT(_msize(const_cast<void*>(p)));
 #endif
 #endif
 }

-- 
WebKit Debian packaging