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

* commit 'aaa920d7969d9dd4b9e7871f2758d9092095bead':
  Make Unicode.h use types that match libc++.
This commit is contained in:
Dan Albert 2014-11-09 09:03:30 +00:00 committed by Android Git Automerger
commit 7c7a782cad

View file

@ -24,8 +24,8 @@ extern "C" {
// 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.