diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-08 11:49:07 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-11-08 20:22:30 +0000 |
| commit | 2f5ad5ff8623604ac2e7fa0b704287511acea1e2 (patch) | |
| tree | 2cb55245708ed5eae6051e3386b146550d15a5b2 /include | |
| parent | 2655256570b7c1c5af6d886735835eecb99f45f2 (diff) | |
| download | system_core-2f5ad5ff8623604ac2e7fa0b704287511acea1e2.zip system_core-2f5ad5ff8623604ac2e7fa0b704287511acea1e2.tar.gz system_core-2f5ad5ff8623604ac2e7fa0b704287511acea1e2.tar.bz2 | |
Make Unicode.h use types that match libc++.
libc++ also defines these types for pre-C++11, and the two definitions
need to match to avoid redefinition errors.
Bug: 18300613
Change-Id: I1e9198d39f7c470f37bc6edba2dca2d499f54c9b
Diffstat (limited to 'include')
| -rw-r--r-- | include/utils/Unicode.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ 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. |