From 81337366b7ef84b98a2d27e75688ed123e863021 Mon Sep 17 00:00:00 2001 From: zhangdd_ewan Date: Thu, 16 May 2024 11:22:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?GetIcuVersion()=E6=8E=A5=E5=8F=A3=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=9F=AD=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangdd_ewan --- icu4c/source/ohos/init_data.cpp | 4 ++-- icu4c/source/ohos/init_data.h | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/icu4c/source/ohos/init_data.cpp b/icu4c/source/ohos/init_data.cpp index 0b8dab72..f30bccd5 100644 --- a/icu4c/source/ohos/init_data.cpp +++ b/icu4c/source/ohos/init_data.cpp @@ -14,7 +14,7 @@ */ #include "init_data.h" -#include +#include #include namespace { @@ -38,7 +38,7 @@ void SetHwIcuDirectory( ) extern "C" const char* GetIcuVersion() { - const char* icuVerion = U_ICU_VERSION; + const char* icuVerion = U_ICU_VERSION_SHORT; return icuVerion; } diff --git a/icu4c/source/ohos/init_data.h b/icu4c/source/ohos/init_data.h index 1348b004..698a1dc0 100644 --- a/icu4c/source/ohos/init_data.h +++ b/icu4c/source/ohos/init_data.h @@ -24,11 +24,13 @@ */ void SetHwIcuDirectory( ); -#endif - /** * get icu version */ extern "C" const char* GetIcuVersion(); extern "C" void SetOhosIcuDirectory(); + +#endif + + From 2aaff92eb0bd51ea9cc9dbfa533ad809f6d55393 Mon Sep 17 00:00:00 2001 From: zhangdd_ewan Date: Thu, 16 May 2024 11:23:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?GetIcuVersion()=E6=8E=A5=E5=8F=A3=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=9F=AD=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangdd_ewan --- icu4c/source/ohos/init_data.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/icu4c/source/ohos/init_data.h b/icu4c/source/ohos/init_data.h index 698a1dc0..7d29071f 100644 --- a/icu4c/source/ohos/init_data.h +++ b/icu4c/source/ohos/init_data.h @@ -31,6 +31,4 @@ extern "C" const char* GetIcuVersion(); extern "C" void SetOhosIcuDirectory(); -#endif - - +#endif \ No newline at end of file