[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
ggaren at apple.com
ggaren at apple.com
Wed Dec 22 17:53:41 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit d76a5825cc0cbe7f697a67972bd2a498a8220bce
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 2 03:50:59 2010 +0000
Try to fix the Chromium build.
* JavaScriptCore.gypi: This is a Windows build file, so use OSAllocatorWin.cpp.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73105 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 64ad068..8c05eb1 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,11 @@
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.
+
+2010-12-01 Geoffrey Garen <ggaren at apple.com>
+
Try to fix the GTK build.
* GNUmakefile.am: Added OSAllocator to another project.
diff --git a/JavaScriptCore/JavaScriptCore.gypi b/JavaScriptCore/JavaScriptCore.gypi
index 355aff9..676a35d 100644
--- a/JavaScriptCore/JavaScriptCore.gypi
+++ b/JavaScriptCore/JavaScriptCore.gypi
@@ -400,7 +400,7 @@
'wtf/NonCopyingSort.h',
'wtf/Noncopyable.h',
'wtf/NotFound.h',
- 'wtf/OSAllocatorPosix.cpp',
+ 'wtf/OSAllocatorWin.cpp',
'wtf/OSAllocator.h',
'wtf/OwnArrayPtr.h',
'wtf/OwnFastMallocPtr.h',
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list