diff --git a/src/common/unicode_util.cpp b/src/common/unicode_util.cpp index 83241ffa5d..9d257c0615 100644 --- a/src/common/unicode_util.cpp +++ b/src/common/unicode_util.cpp @@ -517,7 +517,12 @@ static ModuleLoader::Module* formatAndLoad(const char* templateName, // ICU has several schemas for placing version into file name const char* const patterns[] = { - "%d_%d", "%d.%d", "%d%d" +#ifdef WIN_NT + "%d", +#endif + "%d_%d", + "%d.%d", + "%d%d" }; PathName s, filename; @@ -531,7 +536,9 @@ static ModuleLoader::Module* formatAndLoad(const char* templateName, break; } +#ifndef WIN_NT // There is no sence to try pattern "%d" for different minor versions + // ASF: In Windows ICU 63.1 libraries use 63.dll suffix. This is handled in 'patterns' above. if (!module && minorVersion == 0) { s.printf("%d", majorVersion); @@ -539,6 +546,7 @@ static ModuleLoader::Module* formatAndLoad(const char* templateName, module = ModuleLoader::fixAndLoadModule(NULL, filename); } +#endif } return module; @@ -1327,7 +1335,7 @@ UnicodeUtil::ConversionICU& UnicodeUtil::getConversionICU() // Try "favorite" (distributed on windows) version first const int favMaj = 63; - const int favMin = 0; + const int favMin = 1; try { if ((convIcu = ImplementConversionICU::create(favMaj, favMin)))