summaryrefslogtreecommitdiffstats
path: root/WebKit/cf
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2009-03-05 14:34:32 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-05 14:34:32 -0800
commit635860845790a19bf50bbc51ba8fb66a96dde068 (patch)
treeef6ad9ff73a5b57f65249d4232a202fa77e6a140 /WebKit/cf
parent8e35f3cfc7fba1d1c829dc557ebad6409cbe16a2 (diff)
downloadexternal_webkit-635860845790a19bf50bbc51ba8fb66a96dde068.zip
external_webkit-635860845790a19bf50bbc51ba8fb66a96dde068.tar.gz
external_webkit-635860845790a19bf50bbc51ba8fb66a96dde068.tar.bz2
auto import from //depot/cupcake/@136594
Diffstat (limited to 'WebKit/cf')
-rw-r--r--WebKit/cf/ChangeLog6
-rw-r--r--WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp12
2 files changed, 14 insertions, 4 deletions
diff --git a/WebKit/cf/ChangeLog b/WebKit/cf/ChangeLog
index 3e06358..d651266 100644
--- a/WebKit/cf/ChangeLog
+++ b/WebKit/cf/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-09 Dimitri Glazkov <dglazkov@chromium.org>
+
+ Fix bustage.
+
+ * WebCoreSupport/WebInspectorClientCF.cpp:
+
2008-10-24 Adam Roben <aroben@apple.com>
Windows build fix
diff --git a/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp b/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp
index a4cb934..443a35d 100644
--- a/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp
+++ b/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp
@@ -25,14 +25,18 @@
// FIXME: On Windows, we require all WebKit source files to include config.h
// before including any other files. Failing to include config.h will leave
-// WTF_PLATFORM_CF undefined, causing build failures in this file. But Mac
-// doesn't have a config.h for WebKit, so we can't include the Windows one
-// here. For now we can just define WTF_PLATFORM_CF manually, but we need a
-// better long-term solution.
+// WTF_PLATFORM_CF and WTF_USE_JSC undefined, causing build failures in this
+// file. But Mac doesn't have a config.h for WebKit, so we can't include the
+// Windows one here. For now we can just define WTF_PLATFORM_CF and WTF_USE_JSC
+// manually, but we need a better long-term solution.
#ifndef WTF_PLATFORM_CF
#define WTF_PLATFORM_CF 1
#endif
+#ifndef WTF_USE_JSC
+#define WTF_USE_JSC 1
+#endif
+
#include "WebInspectorClient.h"
#include <CoreFoundation/CoreFoundation.h>