summaryrefslogtreecommitdiff
path: root/Build/source/libs/icu/icu-50.1/common/unicode/umachine.h
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/icu/icu-50.1/common/unicode/umachine.h')
-rw-r--r--Build/source/libs/icu/icu-50.1/common/unicode/umachine.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/Build/source/libs/icu/icu-50.1/common/unicode/umachine.h b/Build/source/libs/icu/icu-50.1/common/unicode/umachine.h
index 6dd6a8e5889..d1102f49365 100644
--- a/Build/source/libs/icu/icu-50.1/common/unicode/umachine.h
+++ b/Build/source/libs/icu/icu-50.1/common/unicode/umachine.h
@@ -256,7 +256,7 @@ typedef int8_t UBool;
/**
* \var UChar
- * Define UChar to be char16_t, if available,
+ * Define UChar to be UCHAR_TYPE, if that is #defined (for example, to char16_t),
* or wchar_t if that is 16 bits wide; always assumed to be unsigned.
* If neither is available, then define UChar to be uint16_t.
*
@@ -266,10 +266,10 @@ typedef int8_t UBool;
*
* @stable ICU 4.4
*/
-
-/* Define UChar to be compatible with char16_t or wchar_t if possible. */
-#if U_HAVE_CHAR16_T
- typedef char16_t UChar;
+#if defined(UCHAR_TYPE)
+ typedef UCHAR_TYPE UChar;
+/* Not #elif U_HAVE_CHAR16_T -- because that is type-incompatible with pre-C++11 callers
+ typedef char16_t UChar; */
#elif U_SIZEOF_WCHAR_T==2
typedef wchar_t UChar;
#elif defined(__CHAR16_TYPE__)