[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

yong.li at torchmobile.com yong.li at torchmobile.com
Thu Apr 8 00:58:48 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit 4ddd1d81822d9691da09042b2683250ac1724347
Author: yong.li at torchmobile.com <yong.li at torchmobile.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 8 22:05:18 2010 +0000

    2010-01-08  Yong Li  <yoli at rim.com>
    
            Reviewed by Darin Adler.
    
            Remove unnecessary #include from FastMalloc.cpp
            https://bugs.webkit.org/show_bug.cgi?id=33393
    
            * wtf/FastMalloc.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53008 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index de9d551..c4e93c9 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-08  Yong Li  <yoli at rim.com>
+
+        Reviewed by Darin Adler.
+
+        Remove unnecessary #include from FastMalloc.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=33393
+
+        * wtf/FastMalloc.cpp:
+
 2010-01-08  Eric Seidel  <eric at webkit.org>
 
         No review, rolling out r52983.
diff --git a/JavaScriptCore/wtf/FastMalloc.cpp b/JavaScriptCore/wtf/FastMalloc.cpp
index 886dbe4..f943b7e 100644
--- a/JavaScriptCore/wtf/FastMalloc.cpp
+++ b/JavaScriptCore/wtf/FastMalloc.cpp
@@ -191,13 +191,6 @@ TryMallocReturnValue tryFastZeroedMalloc(size_t n)
 
 #if FORCE_SYSTEM_MALLOC
 
-#include <stdlib.h>
-#if !OS(WINDOWS)
-    #include <pthread.h>
-#else
-    #include "windows.h"
-#endif
-
 namespace WTF {
 
 TryMallocReturnValue tryFastMalloc(size_t n) 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list