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

[ggaren at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 0acf21e68d85563d4057b29b1bbcc17be5953d45
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 2 04:04:55 2010 +0000

    Try to fix the Qt build: Include all OS files for Qt's sake, and then
    use #ifdefs in the files to exclude things based on OS.
    
    This is a pretty bad way to manage platforms -- hopefully we can
    fix the Qt build system and move away from this in the future.
    
    * wtf/OSAllocatorPosix.cpp:
    * wtf/OSAllocatorSymbian.cpp:
    * wtf/OSAllocatorWin.cpp:
    * wtf/wtf.pri:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73106 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 8c05eb1..f26db79 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,18 @@
 2010-12-01  Geoffrey Garen  <ggaren at apple.com>
 
+        Try to fix the Qt build: Include all OS files for Qt's sake, and then
+        use #ifdefs in the files to exclude things based on OS.
+        
+        This is a pretty bad way to manage platforms -- hopefully we can
+        fix the Qt build system and move away from this in the future.
+
+        * wtf/OSAllocatorPosix.cpp:
+        * wtf/OSAllocatorSymbian.cpp:
+        * wtf/OSAllocatorWin.cpp:
+        * wtf/wtf.pri:
+
+2010-12-01  Geoffrey Garen  <ggaren at apple.com>
+
         Try to fix the Chromium build.
         
         * JavaScriptCore.gypi: This is a Windows build file, so use OSAllocatorWin.cpp.
diff --git a/JavaScriptCore/wtf/OSAllocatorPosix.cpp b/JavaScriptCore/wtf/OSAllocatorPosix.cpp
index 29b8904..d1d4af5 100644
--- a/JavaScriptCore/wtf/OSAllocatorPosix.cpp
+++ b/JavaScriptCore/wtf/OSAllocatorPosix.cpp
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "OSAllocator.h"
 
+#if OS(UNIX) && !OS(SYMBIAN)
+
 #include <errno.h>
 #include <sys/mman.h>
 #include <wtf/Assertions.h>
@@ -81,3 +83,5 @@ void OSAllocator::release(void* address, size_t bytes)
 }
 
 } // namespace WTF
+
+#endif
diff --git a/JavaScriptCore/wtf/OSAllocatorSymbian.cpp b/JavaScriptCore/wtf/OSAllocatorSymbian.cpp
index 445b77a..c1cc08c 100644
--- a/JavaScriptCore/wtf/OSAllocatorSymbian.cpp
+++ b/JavaScriptCore/wtf/OSAllocatorSymbian.cpp
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "OSAllocator.h"
 
+#if OS(SYMBIAN)
+
 #include <wtf/FastMalloc.h>
 
 namespace WTF {
@@ -54,3 +56,5 @@ void OSAllocator::release(void* address, size_t)
 }
 
 } // namespace WTF
+
+#endif
diff --git a/JavaScriptCore/wtf/OSAllocatorWin.cpp b/JavaScriptCore/wtf/OSAllocatorWin.cpp
index eb21e37..384fe13 100644
--- a/JavaScriptCore/wtf/OSAllocatorWin.cpp
+++ b/JavaScriptCore/wtf/OSAllocatorWin.cpp
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "OSAllocator.h"
 
+#if OS(WINDOWS)
+
 #include "windows.h"
 
 namespace WTF {
@@ -58,3 +60,5 @@ void OSAllocator::release(void* address, size_t bytes)
 }
 
 } // namespace WTF
+
+#endif
diff --git a/JavaScriptCore/wtf/wtf.pri b/JavaScriptCore/wtf/wtf.pri
index e9d57f3..0f7241c 100644
--- a/JavaScriptCore/wtf/wtf.pri
+++ b/JavaScriptCore/wtf/wtf.pri
@@ -14,6 +14,8 @@ SOURCES += \
     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 \

-- 
WebKit Debian packaging