commit 9f9d9e668c72528bd3c0167fa4c9aa9d67a54992
author Dan Albert <danalbert@google.com> Sun Nov 09 09:11:52 2014 +0000
committer android-build-merger <android-build-merger@google.com> Sun Nov 09 09:11:52 2014 +0000
tree ff1fa29ad167c58be9f3f17fdabaf154145f5c7e
parent 402f8f779b6ff6ba7eb40081993842b94d098ade
parent 7c7a782cad42ec1d1f815e648c71210c74db794d

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

* commit '7c7a782cad42ec1d1f815e648c71210c74db794d':
  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.