commit 5d524aa8973b69fb51b784faf144a96ebf2b2d64
author Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> Fri Aug 24 21:14:09 2012 +0200
committer Amit Pundir <amit.pundir@linaro.org> Thu Jul 25 12:58:48 2013 +0530
tree 2de10784e5d7aae8541a47c68d2bcb956e8098a8
parent 7439f9806c420fc1e924a2dbe340a83ade8b04c4

frameworks/native: Fix build in ISO C++11 mode

Change-Id: Icc19cde1bf9c72397ed8bda545e9056483d83e8d
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>

include/utils/Unicode.h

diff --git a/include/utils/Unicode.h b/include/utils/Unicode.h
index 9273533..443f66d 100644
--- a/include/utils/Unicode.h
+++ b/include/utils/Unicode.h
@@ -22,8 +22,10 @@
 
 extern "C" {
 
+#if __cplusplus < 201103L && !defined(__GXX_EXPERIMENTAL_CXX0X__) && !defined(char16_t)
 typedef uint32_t char32_t;
 typedef uint16_t char16_t;
+#endif
 
 // Standard string functions on char16_t strings.
 int strcmp16(const char16_t *, const char16_t *);