From 745c5e6c55501b5c0102008fb737d71e013fe57b Mon Sep 17 00:00:00 2001 From: "brettw@gmail.com" Date: Sat, 22 Aug 2009 01:01:28 +0000 Subject: [PATCH] Use U_ICU_VERSION_SHORT macro instead of hard-coding icu data dll and module name. BUG=8198 TEST=googleurl test should be built and run without a problem. Patch by Jungshik Shin Review: http://codereview.chromium.org/174265 git-svn-id: http://google-url.googlecode.com/svn/trunk@114 8873c55e-713a-0410-88f8-23d9c3d90b1b --- src/gurl_test_main.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gurl_test_main.cc b/src/gurl_test_main.cc index 377cfbd..9a7c9f4 100644 --- a/src/gurl_test_main.cc +++ b/src/gurl_test_main.cc @@ -55,14 +55,15 @@ #endif // ICU_UTIL_DATA_IMPL #if defined(OS_WIN) -#define ICU_UTIL_DATA_SYMBOL "icudt38_dat" -#define ICU_UTIL_DATA_SHARED_MODULE_NAME L"icudt38.dll" +#define ICU_UTIL_DATA_SYMBOL "icudt" U_ICU_VERSION_SHORT "_dat" +#define ICU_UTIL_DATA_SHARED_MODULE_NAME "icudt" U_ICU_VERSION_SHORT ".dll" #endif bool InitializeICU() { #if (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_SHARED) // We expect to find the ICU data module alongside the current module. - HMODULE module = LoadLibrary(ICU_UTIL_DATA_SHARED_MODULE_NAME); + // Because the module name is ASCII-only, "A" API should be safe. + HMODULE module = LoadLibraryA(ICU_UTIL_DATA_SHARED_MODULE_NAME); if (!module) return false; -- 2.11.4.GIT