Signed-off-by: mengjingzhimo <luoboming@huawei.com>

Changes to be committed:
	modified:   icu4c/BUILD.gn
	modified:   icu4c/source/common/umapfile.cpp
	modified:   icu4c/source/common/unicode/uvernum.h
This commit is contained in:
mengjingzhimo 2023-01-17 20:28:38 +08:00
parent 921f84c0c3
commit a91cd1e78c
3 changed files with 6 additions and 8 deletions

View File

@ -21,10 +21,7 @@ config("icu_config") {
"//third_party/icu/icu4c/source",
]
if (icu_support_locales) {
defines = [
"U_ICU_VERSION_SUFFIX=_68",
"U_ICU_VERSION_SHORT=\"68\"",
]
defines = [ "U_ICU_USE_OLD_DATA" ]
}
}

View File

@ -481,10 +481,15 @@ typedef HANDLE MemoryMap;
/* THE FIRST THREE LETTERS ARE PREASSIGNED TO THE */
/* PROJECT!!!!! */
uprv_strcpy(pathBuffer, "IXMI" U_ICU_VERSION_SHORT "DA");
# else
# ifdef U_ICU_USE_OLD_DATA
/* set up the library name */
uprv_strcpy(basename, LIB_PREFIX U_LIBICUDATA_NAME "68" LIB_SUFFIX);
# else
/* set up the library name */
uprv_strcpy(basename, LIB_PREFIX U_LIBICUDATA_NAME U_ICU_VERSION_SHORT LIB_SUFFIX);
# endif
# endif
# ifdef UDATA_DEBUG
fprintf(stderr, "dllload: %s ", pathBuffer);

View File

@ -86,9 +86,7 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.6
*/
#ifndef U_ICU_VERSION_SUFFIX
#define U_ICU_VERSION_SUFFIX _69
#endif
/**
* \def U_DEF2_ICU_ENTRY_POINT_RENAME
@ -154,9 +152,7 @@
*
* @stable ICU 2.6
*/
#ifndef U_ICU_VERSION_SHORT
#define U_ICU_VERSION_SHORT "69"
#endif
#ifndef U_HIDE_INTERNAL_API
/** Data version in ICU4C.