[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

vestbo at webkit.org vestbo at webkit.org
Thu Oct 29 20:38:08 UTC 2009


The following commit has been merged in the webkit-1.1 branch:
commit f1641618bb19b5708c07fd2aca7cade10c4dee89
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 2 15:40:52 2009 +0000

    Fix the Qt on Mac OS X build.
    
    Rubber-stamped by Simon Hausmann.
    
    * wtf/FastMalloc.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49022 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 4f53ba9..48800c7 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2009-10-02  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
+
+        Rubber-stamped by Simon Hausmann.
+
+        Fix the Qt on Mac OS X build.
+
+        * wtf/FastMalloc.cpp:
+
 2009-10-02  Jørgen Lind  <jorgen.lind at nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/JavaScriptCore/wtf/FastMalloc.cpp b/JavaScriptCore/wtf/FastMalloc.cpp
index a2d601f..6cd8ef0 100644
--- a/JavaScriptCore/wtf/FastMalloc.cpp
+++ b/JavaScriptCore/wtf/FastMalloc.cpp
@@ -394,6 +394,7 @@ extern "C" const int jscore_fastmalloc_introspection = 0;
 #if PLATFORM(DARWIN)
 #include "MallocZoneSupport.h"
 #include <wtf/HashSet.h>
+#include <wtf/Vector.h>
 #endif
 
 #ifndef PRIuS

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list