commit 7c7a782cad42ec1d1f815e648c71210c74db794d
author Dan Albert <danalbert@google.com> Sun Nov 09 09:03:30 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sun Nov 09 09:03:30 2014 +0000
tree 7de8aa177e218a24510cc6ee8873e802f8d428aa
parent aeac9cd1b3c9a1dfe334857e74b20ff1843ae87c
parent aaa920d7969d9dd4b9e7871f2758d9092095bead

am aaa920d7: Merge "Make Unicode.h use types that match libc++."

* commit 'aaa920d7969d9dd4b9e7871f2758d9092095bead':
  Make Unicode.h use types that match libc++.

include/utils/Unicode.h

diff --git a/include/utils/Unicode.h b/include/utils/Unicode.h
index 5b98de2..aaf951b 100644
--- a/include/utils/Unicode.h
+++ b/include/utils/Unicode.h
@@ -24,8 +24,8 @@
 
 // Definitions exist in C++11
 #if defined __cplusplus && __cplusplus < 201103L
-typedef uint32_t char32_t;
-typedef uint16_t char16_t;
+typedef unsigned int   char32_t;
+typedef unsigned short char16_t;
 #endif
 
 // Standard string functions on char16_t strings.