From 71cad9edb610fed078966852a8e2fc35b4b6a4a1 Mon Sep 17 00:00:00 2001 From: "jochen@chromium.org" Date: Thu, 1 Aug 2013 19:21:16 +0000 Subject: [PATCH] Fix incorrect #ifdef statements for I18N support. R=jkummerow@chromium.org Review URL: https://codereview.chromium.org/21509002 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@16014 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/api.cc | 6 +++--- src/icu_util.cc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/api.cc b/src/api.cc index d532a1f..1ae81b1 100644 --- a/src/api.cc +++ b/src/api.cc @@ -398,7 +398,7 @@ enum CompressedStartupDataItems { kSnapshotContext, kLibraries, kExperimentalLibraries, -#if defined(ENABLE_I18N_SUPPORT) +#if defined(V8_I18N_SUPPORT) kI18NExtension, #endif kCompressedStartupDataCount @@ -442,7 +442,7 @@ void V8::GetCompressedStartupData(StartupData* compressed_data) { compressed_data[kExperimentalLibraries].raw_size = i::ExperimentalNatives::GetRawScriptsSize(); -#if defined(ENABLE_I18N_SUPPORT) +#if defined(V8_I18N_SUPPORT) i::Vector i18n_extension_source = i::I18NNatives::GetScriptsSource(); compressed_data[kI18NExtension].data = @@ -482,7 +482,7 @@ void V8::SetDecompressedStartupData(StartupData* decompressed_data) { decompressed_data[kExperimentalLibraries].raw_size); i::ExperimentalNatives::SetRawScriptsSource(exp_libraries_source); -#if defined(ENABLE_I18N_SUPPORT) +#if defined(V8_I18N_SUPPORT) ASSERT_EQ(i::I18NNatives::GetRawScriptsSize(), decompressed_data[kI18NExtension].raw_size); i::Vector i18n_extension_source( diff --git a/src/icu_util.cc b/src/icu_util.cc index 91f4527..b9bd65e 100644 --- a/src/icu_util.cc +++ b/src/icu_util.cc @@ -27,7 +27,7 @@ #include "icu_util.h" -#if defined(_WIN32) && defined(ENABLE_I18N_SUPPORT) +#if defined(_WIN32) && defined(V8_I18N_SUPPORT) #include #include "unicode/putil.h" @@ -42,7 +42,7 @@ namespace v8 { namespace internal { bool InitializeICU() { -#if defined(_WIN32) && defined(ENABLE_I18N_SUPPORT) +#if defined(_WIN32) && defined(V8_I18N_SUPPORT) // We expect to find the ICU data module alongside the current module. HMODULE module = LoadLibraryA(ICU_UTIL_DATA_SHARED_MODULE_NAME); if (!module) return false; -- 2.7.4