Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f9d9e66 authored by Dan Albert's avatar Dan Albert Committed by android-build-merger
Browse files

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

automerge: 7c7a782c

* commit '7c7a782c':
  Make Unicode.h use types that match libc++.
parents 402f8f77 7c7a782c

include/utils/Unicode.h

+2 −2
Original line number Diff line number Diff line
@@ -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.