Reviewers: Jakob,
Description:
Fix incorrect #ifdef statements for I18N support.
[email protected]
Please review this at https://codereview.chromium.org/21509002/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M src/api.cc
M src/icu_util.cc
Index: src/api.cc
diff --git a/src/api.cc b/src/api.cc
index
d532a1f2fd8a01e2d1ef5e82295d5263017b7229..1ae81b13252e3a1bdf50cb53b66433dd49b053f3
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<const ii:byte> 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<const char> i18n_extension_source(
Index: src/icu_util.cc
diff --git a/src/icu_util.cc b/src/icu_util.cc
index
91f45278ee546d3b10db7321cbfdb3b1dcd3f4f4..b9bd65edc69ecb680a9cae4efc96ed3158543285
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 <windows.h>
#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;
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
