[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
ggaren at apple.com
ggaren at apple.com
Sun Feb 20 23:01:07 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit c2c80282ff723fb39a6cc2f767544c3440e53ee6
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Jan 15 01:52:28 2011 +0000
Try to fix non-Dtrace builds: #include Tracing.h instead of TracingDtrace.h.
* runtime/Heap.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75856 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 1e7b7f9..2d51b86 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-14 Geoffrey Garen <ggaren at apple.com>
+
+ Try to fix non-Dtrace builds: #include Tracing.h instead of TracingDtrace.h.
+
+ * runtime/Heap.cpp:
+
2011-01-13 Geoffrey Garen <ggaren at apple.com>
Reviewed by Oliver Hunt.
diff --git a/Source/JavaScriptCore/runtime/Heap.cpp b/Source/JavaScriptCore/runtime/Heap.cpp
index 0de2a3b..20e7519 100644
--- a/Source/JavaScriptCore/runtime/Heap.cpp
+++ b/Source/JavaScriptCore/runtime/Heap.cpp
@@ -29,7 +29,7 @@
#include "JSGlobalObject.h"
#include "JSLock.h"
#include "JSONObject.h"
-#include "TracingDtrace.h"
+#include "Tracing.h"
#define COLLECT_ON_EVERY_ALLOCATION 0
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list