From 0fc9197e4c30ba285319ef4de12ceabc12a27db6 Mon Sep 17 00:00:00 2001 From: Andy Heninger Date: Wed, 18 Jan 2017 21:26:05 +0000 Subject: [PATCH] ICU-12645 Make UChar type default char16_t. If all proceeds well, a future change will remove the conditional logic. X-SVN-Rev: 39575 --- icu4c/source/common/unicode/umachine.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/icu4c/source/common/unicode/umachine.h b/icu4c/source/common/unicode/umachine.h index 547ef1ec499..5a68d684a17 100644 --- a/icu4c/source/common/unicode/umachine.h +++ b/icu4c/source/common/unicode/umachine.h @@ -54,7 +54,7 @@ #ifndef U_HIDE_INTERNAL_API /* * U_USE_CHAR16_T - * When defined, force use of char16_t for UChar. + * When set, force use of char16_t for UChar. * Note: char16_t is expected to become the default and required in the future, * and this option will be removed. * @@ -62,7 +62,11 @@ * but Macintosh Xcode does not yet implement it. * @internal */ -#ifdef U_USE_CHAR16_T +#ifndef U_USE_CHAR16_T +#define U_USE_CHAR16_T 1 +#endif + +#if U_USE_CHAR16_T #ifdef __cplusplus #ifdef UCHAR_TYPE #undef UCHAR_TYPE -- 2.40.0