ICU-12645 Make UChar type default char16_t. If all proceeds well, a future change will remove the conditional logic.

X-SVN-Rev: 39575
This commit is contained in:
Andy Heninger 2017-01-18 21:26:05 +00:00
parent b63a4751fa
commit 0fc9197e4c

View File

@ -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