diff options
| author | Steve Block <steveblock@google.com> | 2010-11-03 21:41:40 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-11-08 14:42:56 +0000 |
| commit | fcb462de639304deaa2da761823fbfeef88b36d4 (patch) | |
| tree | c047c2e329c701583ff0081692dcb5cf9acad45a /WebCore | |
| parent | 9934d5d8bbc7e1f13e620eac325528f9e92d67ee (diff) | |
| download | external_webkit-fcb462de639304deaa2da761823fbfeef88b36d4.zip external_webkit-fcb462de639304deaa2da761823fbfeef88b36d4.tar.gz external_webkit-fcb462de639304deaa2da761823fbfeef88b36d4.tar.bz2 | |
Fix some compiler warnings
Noe that in FindCanvas.h we include
external/icu4c/common/unicode/umachine.h, rather than
external/webkit/WebCore/icu/unicode/umachine.h to avoid warnings about
redefining U_NAMESPACE_BEGIN
We should be using the header from external/icu4c because we don't
include any ICU headers from WebCore.
The fix works becuase external/icu4c/common is on the include path,
but WebCore/icu is not.
Change-Id: I5c0ff1c5815018ba97962595debca12a17bdd0cd
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/page/Settings.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp index 8e8d43b..aa758c4 100644 --- a/WebCore/page/Settings.cpp +++ b/WebCore/page/Settings.cpp @@ -160,12 +160,12 @@ Settings::Settings(Page* page) , m_interactiveFormValidation(false) , m_usePreHTML5ParserQuirks(false) , m_hyperlinkAuditingEnabled(false) -#if ENABLE(WEB_AUTOFILL) - , m_autoFillEnabled(false) -#endif #ifdef ANDROID_PLUGINS , m_pluginsOnDemand(false) #endif +#if ENABLE(WEB_AUTOFILL) + , m_autoFillEnabled(false) +#endif { // A Frame may not have been created yet, so we initialize the AtomicString // hash before trying to use it. |