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

Changes to be committed:
	modified:   icu4c/BUILD.gn
	modified:   icu4c/source/common/unicode/umachine.h
This commit is contained in:
mengjingzhimo 2022-09-02 11:14:59 +08:00
parent 825488055b
commit 33d3e58f20
2 changed files with 1 additions and 6 deletions

View File

@ -519,7 +519,6 @@ ohos_shared_library("shared_icuuc") {
"-Wno-error=unneeded-internal-declaration",
"-std=c++11",
"-Wno-ignored-attributes",
"-DU_DEFINE_FALSE_AND_TRUE"
]
ldflags = [
"-shared",
@ -564,7 +563,6 @@ ohos_shared_library("shared_icui18n") {
"-Wwrite-strings",
"-std=c++11",
"-Wno-ignored-attributes",
"-DU_DEFINE_FALSE_AND_TRUE"
]
ldflags = [
"-shared",
@ -615,7 +613,6 @@ ohos_static_library("static_icuuc") {
"-fvisibility-inlines-hidden",
"-Wno-unused-function",
"-Wno-ignored-attributes",
"-DU_DEFINE_FALSE_AND_TRUE"
]
cflags = [
@ -624,7 +621,6 @@ ohos_static_library("static_icuuc") {
"-ffunction-sections",
"-Os",
"-Wno-unused-function",
"-DU_DEFINE_FALSE_AND_TRUE"
]
ldflags = [
@ -668,7 +664,6 @@ ohos_static_library("static_icui18n") {
"-fvisibility-inlines-hidden",
"-fno-exceptions",
"-Wno-ignored-attributes",
"-DU_DEFINE_FALSE_AND_TRUE"
]
if (is_mingw) {
@ -682,7 +677,6 @@ ohos_static_library("static_icui18n") {
"-fdata-sections",
"-ffunction-sections",
"-Os",
"-DU_DEFINE_FALSE_AND_TRUE"
]
ldflags = [

View File

@ -282,6 +282,7 @@ typedef int8_t UBool;
*/
#ifdef U_DEFINE_FALSE_AND_TRUE
// Use the predefined value.
define U_DEFINE_FALSE_AND_TRUE 1
#elif defined(U_COMBINED_IMPLEMENTATION) || \
defined(U_COMMON_IMPLEMENTATION) || defined(U_I18N_IMPLEMENTATION) || \
defined(U_IO_IMPLEMENTATION) || defined(U_LAYOUTEX_IMPLEMENTATION) || \