summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libcxx/include/__config8
1 files changed, 2 insertions, 6 deletions
diff --git a/libcxx/include/__config b/libcxx/include/__config
index 9f9a6150ea2..f6102b20283 100644
--- a/libcxx/include/__config
+++ b/libcxx/include/__config
@@ -90,7 +90,8 @@
#define _LIBCPP_HAS_NO_TEMPLATE_ALIASES
#ifndef __GXX_EXPERIMENTAL_CXX0X__
-#define _LIBCPP_HAS_NO_UNICODE_CHARS
+typedef __char16_t char16_t;
+typedef __char32_t char32_t;
#endif
#if !(__has_feature(cxx_exceptions))
@@ -220,13 +221,8 @@ using namespace _LIBCPP_NAMESPACE __attribute__((__strong__));
#endif // defined(__GNUC__)
#ifdef _LIBCPP_HAS_NO_UNICODE_CHARS
-#ifdef __clang__
-typedef __char16_t char16_t;
-typedef __char32_t char32_t;
-#else
typedef unsigned short char16_t;
typedef unsigned int char32_t;
-#endif
#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
#ifdef _LIBCPP_HAS_NO_STATIC_ASSERT
OpenPOWER on IntegriCloud