From 33d3e58f206898bbae66c1cb3219f3fb2952dee5 Mon Sep 17 00:00:00 2001
From: mengjingzhimo <luoboming@huawei.com>
Date: Fri, 2 Sep 2022 11:14:59 +0800
Subject: [PATCH] Signed-off-by: mengjingzhimo <luoboming@huawei.com>

 Changes to be committed:
	modified:   icu4c/BUILD.gn
	modified:   icu4c/source/common/unicode/umachine.h
---
 icu4c/BUILD.gn                         | 6 ------
 icu4c/source/common/unicode/umachine.h | 1 +
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/icu4c/BUILD.gn b/icu4c/BUILD.gn
index 0b24d6b0..c77cbc81 100644
--- a/icu4c/BUILD.gn
+++ b/icu4c/BUILD.gn
@@ -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 = [
diff --git a/icu4c/source/common/unicode/umachine.h b/icu4c/source/common/unicode/umachine.h
index 09c887c8..5be93f1e 100644
--- a/icu4c/source/common/unicode/umachine.h
+++ b/icu4c/source/common/unicode/umachine.h
@@ -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) || \