summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-11-26 02:21:19 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-11-26 02:21:19 -0800
commit89d209fb97856ae61773dd203dbb5dd12c9f5a6c (patch)
treefd8feaf8a92d07358b43562b660285dbb479f765 /WebCore
parent3dd6957f3a954583cb88b92ecc780f6a6df0e21e (diff)
parentd638a31179a69294fe0900199ef210c11bb82a8a (diff)
downloadexternal_webkit-89d209fb97856ae61773dd203dbb5dd12c9f5a6c.zip
external_webkit-89d209fb97856ae61773dd203dbb5dd12c9f5a6c.tar.gz
external_webkit-89d209fb97856ae61773dd203dbb5dd12c9f5a6c.tar.bz2
Merge change Ice535a82 into eclair-mr2
* changes: Restores the default value for ENABLE(ARCHIVE) in wtf/Platform.h.
Diffstat (limited to 'WebCore')
-rw-r--r--WebCore/config.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/WebCore/config.h b/WebCore/config.h
index f4b93c5..598acc4 100644
--- a/WebCore/config.h
+++ b/WebCore/config.h
@@ -110,6 +110,7 @@
#define ENABLE_XPATH 0
#define ENABLE_XSLT 0
+#undef ENABLE_ARCHIVE // Enabled by default in Platform.h
#define ENABLE_ARCHIVE 0
#define ENABLE_OFFLINE_WEB_APPLICATIONS 1
#define ENABLE_TOUCH_EVENTS 1