From 2f5ad5ff8623604ac2e7fa0b704287511acea1e2 Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Sat, 8 Nov 2014 11:49:07 -0800
Subject: [PATCH] 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
---
 include/utils/Unicode.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/utils/Unicode.h b/include/utils/Unicode.h
index 5b98de2a1..aaf951bd5 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.