From 0334d92394abd17006c9cc61d54822b06cbe92f8 Mon Sep 17 00:00:00 2001 From: Markus Scherer Date: Mon, 23 Sep 2024 20:29:40 -0700 Subject: [PATCH] ICU-22721 simpler check for platforms that dont have char16_t --- icu4c/source/common/unicode/platform.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/icu4c/source/common/unicode/platform.h b/icu4c/source/common/unicode/platform.h index 33b1cd006ea..309ad8bb1fe 100644 --- a/icu4c/source/common/unicode/platform.h +++ b/icu4c/source/common/unicode/platform.h @@ -727,10 +727,13 @@ * Doesn't work on Mac C11 (see workaround in ptypes.h) * or Cygwin less than 3.5. */ -# if defined(__cplusplus) || !(U_PLATFORM_IS_DARWIN_BASED || (U_PLATFORM == U_PF_CYGWIN && CYGWIN_VERSION_DLL_MAJOR < 3005)) +# if defined(__cplusplus) # define U_HAVE_CHAR16_T 1 -# else +# elif U_PLATFORM_IS_DARWIN_BASED || (U_PLATFORM == U_PF_CYGWIN && CYGWIN_VERSION_DLL_MAJOR < 3005) # define U_HAVE_CHAR16_T 0 +# else + // conformant C11 +# define U_HAVE_CHAR16_T 1 # endif #endif