Merge "Update uchar.h from bionic."

2015-12-04 21:36:21 +00:00
parent 0cdb55f880 53bc2e2f1e
commit 008a22f9b9
1 changed files with 5 additions and 0 deletions
--- a/ndk/platforms/android-21/include/uchar.h
+++ b/ndk/platforms/android-21/include/uchar.h
@@ -34,6 +34,11 @@

 __BEGIN_DECLS

+#if __STDC_VERSION__ >= 201112L && !defined(__cplusplus)
+typedef __CHAR16_TYPE__ char16_t;
+typedef __CHAR32_TYPE__ char32_t;
+#endif
+
 #define __STD_UTF_16__ 1
 #define __STD_UTF_32__ 1