diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-11-26 02:21:19 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-11-26 02:21:19 -0800 |
| commit | 89d209fb97856ae61773dd203dbb5dd12c9f5a6c (patch) | |
| tree | fd8feaf8a92d07358b43562b660285dbb479f765 | |
| parent | 3dd6957f3a954583cb88b92ecc780f6a6df0e21e (diff) | |
| parent | d638a31179a69294fe0900199ef210c11bb82a8a (diff) | |
| download | external_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.
| -rw-r--r-- | JavaScriptCore/wtf/Platform.h | 7 | ||||
| -rw-r--r-- | WebCore/config.h | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h index 92ab043..888f6a8 100644 --- a/JavaScriptCore/wtf/Platform.h +++ b/JavaScriptCore/wtf/Platform.h @@ -728,6 +728,13 @@ #define ENABLE_TEXT_CARET 1 #endif +// ENABLE_ARCHIVE is an Android addition. We need this default value to allow +// us to build on Mac. +// FIXME: Upstream to webkit.org. +#if !defined(ENABLE_ARCHIVE) +#define ENABLE_ARCHIVE 1 +#endif + #if !defined(ENABLE_ON_FIRST_TEXTAREA_FOCUS_SELECT_ALL) #define ENABLE_ON_FIRST_TEXTAREA_FOCUS_SELECT_ALL 0 #endif 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 |