[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit f6c143f2fff99aca89cc75ef4d1d90d261df31f8
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 30 23:47:48 2010 +0000

    2010-12-30  Konstantin Tokarev  <annulen at yandex.ru>
    
            Reviewed by David Kilzer.
    
            [Qt] Don't build wtf/TCSystemAlloc.cpp if --system-malloc option is
            used
            https://bugs.webkit.org/show_bug.cgi?id=51672
    
            * WebKit.pri: Replaced USE_SYSTEM_MALLOC with USE_SYSTEM_MALLOC=1
    2010-12-30  Konstantin Tokarev  <annulen at yandex.ru>
    
            Reviewed by David Kilzer.
    
            [Qt] Don't build wtf/TCSystemAlloc.cpp if --system-malloc option is
            used
            https://bugs.webkit.org/show_bug.cgi?id=51672
    
            * wtf/wtf.pri: Replaced USE_SYSTEM_MALLOC with USE_SYSTEM_MALLOC=1
    2010-12-30  Konstantin Tokarev  <annulen at yandex.ru>
    
            Reviewed by David Kilzer.
    
            [Qt] Don't build wtf/TCSystemAlloc.cpp if --system-malloc option is
            used
            https://bugs.webkit.org/show_bug.cgi?id=51672
    
            * DumpRenderTree/qt/DumpRenderTree.pro: Replaced USE_SYSTEM_MALLOC
            with USE_SYSTEM_MALLOC=1
            * WebKitTestRunner/qt/WebKitTestRunner.pro: Replaced USE_SYSTEM_MALLOC
            with USE_SYSTEM_MALLOC=1
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74813 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 998f0a3..b12ab6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-30  Konstantin Tokarev  <annulen at yandex.ru>
+
+        Reviewed by David Kilzer.
+
+        [Qt] Don't build wtf/TCSystemAlloc.cpp if --system-malloc option is
+        used
+        https://bugs.webkit.org/show_bug.cgi?id=51672
+
+        * WebKit.pri: Replaced USE_SYSTEM_MALLOC with USE_SYSTEM_MALLOC=1
+
 2010-12-29  Philippe Normand  <pnormand at igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 5b7aa2a..f8edc56 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-30  Konstantin Tokarev  <annulen at yandex.ru>
+
+        Reviewed by David Kilzer.
+
+        [Qt] Don't build wtf/TCSystemAlloc.cpp if --system-malloc option is
+        used
+        https://bugs.webkit.org/show_bug.cgi?id=51672
+
+        * wtf/wtf.pri: Replaced USE_SYSTEM_MALLOC with USE_SYSTEM_MALLOC=1
+
 2010-12-30  Patrick Gansterer  <paroga at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/JavaScriptCore/wtf/wtf.pri b/JavaScriptCore/wtf/wtf.pri
index c5617ce..c1af024 100644
--- a/JavaScriptCore/wtf/wtf.pri
+++ b/JavaScriptCore/wtf/wtf.pri
@@ -41,7 +41,7 @@ contains(DEFINES, USE_GSTREAMER=1) {
     CONFIG += link_pkgconfig
 }
 
-!contains(DEFINES, USE_SYSTEM_MALLOC) {
+!contains(DEFINES, USE_SYSTEM_MALLOC=1) {
     SOURCES += wtf/TCSystemAlloc.cpp
 }
 
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index bcf0e37..4b017be 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-30  Konstantin Tokarev  <annulen at yandex.ru>
+
+        Reviewed by David Kilzer.
+
+        [Qt] Don't build wtf/TCSystemAlloc.cpp if --system-malloc option is
+        used
+        https://bugs.webkit.org/show_bug.cgi?id=51672
+
+        * DumpRenderTree/qt/DumpRenderTree.pro: Replaced USE_SYSTEM_MALLOC
+        with USE_SYSTEM_MALLOC=1
+        * WebKitTestRunner/qt/WebKitTestRunner.pro: Replaced USE_SYSTEM_MALLOC
+        with USE_SYSTEM_MALLOC=1
+
 2010-12-30  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
 
         Reviewed by David Kilzer.
diff --git a/Tools/DumpRenderTree/qt/DumpRenderTree.pro b/Tools/DumpRenderTree/qt/DumpRenderTree.pro
index e8831a3..5060511 100644
--- a/Tools/DumpRenderTree/qt/DumpRenderTree.pro
+++ b/Tools/DumpRenderTree/qt/DumpRenderTree.pro
@@ -50,4 +50,4 @@ wince*: {
     LIBS += $$WCECOMPAT/lib/wcecompat.lib
 }
 
-DEFINES+=USE_SYSTEM_MALLOC
+DEFINES += USE_SYSTEM_MALLOC=1
diff --git a/Tools/WebKitTestRunner/qt/WebKitTestRunner.pro b/Tools/WebKitTestRunner/qt/WebKitTestRunner.pro
index cf5d5b8..3d8b76c 100644
--- a/Tools/WebKitTestRunner/qt/WebKitTestRunner.pro
+++ b/Tools/WebKitTestRunner/qt/WebKitTestRunner.pro
@@ -14,7 +14,7 @@ include(../../../WebKit.pri)
     OBJECTS_DIR = obj/release
 }
 
-DEFINES += USE_SYSTEM_MALLOC
+DEFINES += USE_SYSTEM_MALLOC=1
 
 INCLUDEPATH += \
     $$BASEDIR \
diff --git a/WebKit.pri b/WebKit.pri
index 6b01b49..aec91e5 100644
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -48,7 +48,7 @@ building-libs {
 }
 
 !mac:!unix|symbian {
-    DEFINES += USE_SYSTEM_MALLOC
+    DEFINES += USE_SYSTEM_MALLOC=1
 }
 
 CONFIG(release, debug|release) {
@@ -88,7 +88,7 @@ valgrind {
     contains(JAVASCRIPTCORE_JIT,yes): error("'JAVASCRIPTCORE_JIT=yes' not supported with valgrind")
     QMAKE_CXXFLAGS += -g
     QMAKE_LFLAGS += -g
-    DEFINES += USE_SYSTEM_MALLOC
+    DEFINES += USE_SYSTEM_MALLOC=1
     DEFINES += ENABLE_JIT=0
     JAVASCRIPTCORE_JIT = no
 }

-- 
WebKit Debian packaging