[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[ossy at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 751d0c7574ca4e579adb632de5b996c64116a768
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 2 20:09:27 2010 +0000

    2010-12-02  Csaba Osztrogonác  <ossy at webkit.org>
    
            Reviewed by Geoffrey Garen.
    
            [Qt] Make platform managing of OSAllocator better than r73106
            https://bugs.webkit.org/show_bug.cgi?id=50385
    
            * wtf/OSAllocatorPosix.cpp: Remove platform specific guard.
            * wtf/OSAllocatorSymbian.cpp: Remove platform specific guard.
            * wtf/OSAllocatorWin.cpp: Remove platform specific guard.
            * wtf/wtf.pri: Add the correct platform specific source file instead of all of them.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73179 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 3a11791..0375b29 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-02  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Reviewed by Geoffrey Garen.
+
+        [Qt] Make platform managing of OSAllocator better than r73106
+        https://bugs.webkit.org/show_bug.cgi?id=50385
+
+        * wtf/OSAllocatorPosix.cpp: Remove platform specific guard.
+        * wtf/OSAllocatorSymbian.cpp: Remove platform specific guard.
+        * wtf/OSAllocatorWin.cpp: Remove platform specific guard.
+        * wtf/wtf.pri: Add the correct platform specific source file instead of all of them.
+
 2010-12-02  Patrick Gansterer  <paroga at webkit.org>
 
         Reviewed by Andreas Kling.
diff --git a/JavaScriptCore/wtf/OSAllocatorPosix.cpp b/JavaScriptCore/wtf/OSAllocatorPosix.cpp
index d1d4af5..29b8904 100644
--- a/JavaScriptCore/wtf/OSAllocatorPosix.cpp
+++ b/JavaScriptCore/wtf/OSAllocatorPosix.cpp
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "OSAllocator.h"
 
-#if OS(UNIX) && !OS(SYMBIAN)
-
 #include <errno.h>
 #include <sys/mman.h>
 #include <wtf/Assertions.h>
@@ -83,5 +81,3 @@ void OSAllocator::release(void* address, size_t bytes)
 }
 
 } // namespace WTF
-
-#endif
diff --git a/JavaScriptCore/wtf/OSAllocatorSymbian.cpp b/JavaScriptCore/wtf/OSAllocatorSymbian.cpp
index c1cc08c..445b77a 100644
--- a/JavaScriptCore/wtf/OSAllocatorSymbian.cpp
+++ b/JavaScriptCore/wtf/OSAllocatorSymbian.cpp
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "OSAllocator.h"
 
-#if OS(SYMBIAN)
-
 #include <wtf/FastMalloc.h>
 
 namespace WTF {
@@ -56,5 +54,3 @@ void OSAllocator::release(void* address, size_t)
 }
 
 } // namespace WTF
-
-#endif
diff --git a/JavaScriptCore/wtf/OSAllocatorWin.cpp b/JavaScriptCore/wtf/OSAllocatorWin.cpp
index 384fe13..eb21e37 100644
--- a/JavaScriptCore/wtf/OSAllocatorWin.cpp
+++ b/JavaScriptCore/wtf/OSAllocatorWin.cpp
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "OSAllocator.h"
 
-#if OS(WINDOWS)
-
 #include "windows.h"
 
 namespace WTF {
@@ -60,5 +58,3 @@ void OSAllocator::release(void* address, size_t bytes)
 }
 
 } // namespace WTF
-
-#endif
diff --git a/JavaScriptCore/wtf/wtf.pri b/JavaScriptCore/wtf/wtf.pri
index 0f7241c..6a7ac41 100644
--- a/JavaScriptCore/wtf/wtf.pri
+++ b/JavaScriptCore/wtf/wtf.pri
@@ -13,9 +13,6 @@ SOURCES += \
     wtf/HashTable.cpp \
     wtf/MD5.cpp \
     wtf/MainThread.cpp \
-    wtf/OSAllocatorPosix.cpp \
-    wtf/OSAllocatorSymbian.cpp \
-    wtf/OSAllocatorWin.cpp \
     wtf/qt/MainThreadQt.cpp \
     wtf/qt/StringQt.cpp \
     wtf/qt/ThreadingQt.cpp \
@@ -46,3 +43,6 @@ contains(DEFINES, USE_GSTREAMER=1) {
     SOURCES += wtf/TCSystemAlloc.cpp
 }
 
+unix: SOURCES += wtf/OSAllocatorPosix.cpp
+symbian: SOURCES += wtf/OSAllocatorSymbian.cpp
+win*|wince*: SOURCES += wtf/OSAllocatorWin.cpp

-- 
WebKit Debian packaging