firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 18:03:03 +01:00
Code Issues

Postfix for #7169 and Windows build.

Browse Source
This commit is contained in:
Adriano dos Santos Fernandes 2022-04-22 10:58:37 -03:00
parent 0f13df3ce5
commit 92c4170ebc
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/unicode_util.cpp
View File

@ -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)))