diff options
Diffstat (limited to 'base')
| -rw-r--r-- | base/base.gyp | 8 | ||||
| -rw-r--r-- | base/icu_util.cc | 9 |
2 files changed, 11 insertions, 6 deletions
diff --git a/base/base.gyp b/base/base.gyp index a495d49..f6a7192 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -14,8 +14,8 @@ 'target_name': 'base', 'type': '<(library)', 'dependencies': [ - '../third_party/icu38/icu38.gyp:icui18n', - '../third_party/icu38/icu38.gyp:icuuc', + '../third_party/icu/icu.gyp:icui18n', + '../third_party/icu/icu.gyp:icuuc', ], 'msvs_guid': '1832A374-8A74-4F9E-B536-69A699B3E165', 'sources': [ @@ -667,7 +667,7 @@ 'include_dirs': [ # word_iterator.h (used by word_iterator_unittest.cc) leaks an ICU # #include for unicode/uchar.h. This should probably be cleaned up. - '../third_party/icu38/public/common', + '../third_party/icu/public/common', ], 'dependencies': [ 'base', @@ -703,7 +703,7 @@ # TODO(mark): This should not be necessary. ['OS == "win"', { 'dependencies': [ - '../third_party/icu38/icu38.gyp:icudata', + '../third_party/icu/icu.gyp:icudata', ], 'sources!': [ 'data_pack_unittest.cc', diff --git a/base/icu_util.cc b/base/icu_util.cc index 0f42395..b885cd1 100644 --- a/base/icu_util.cc +++ b/base/icu_util.cc @@ -62,12 +62,17 @@ bool Initialize() { ASCIIToWide(ICU_UTIL_DATA_SHARED_MODULE_NAME)); HMODULE module = LoadLibrary(data_path.c_str()); - if (!module) + if (!module) { + LOG(ERROR) << "Failed to load " << ICU_UTIL_DATA_SHARED_MODULE_NAME; return false; + } FARPROC addr = GetProcAddress(module, ICU_UTIL_DATA_SYMBOL); - if (!addr) + if (!addr) { + LOG(ERROR) << ICU_UTIL_DATA_SYMBOL << ": not found in " + << ICU_UTIL_DATA_SHARED_MODULE_NAME; return false; + } UErrorCode err = U_ZERO_ERROR; udata_setCommonData(reinterpret_cast<void*>(addr), &err); |