summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-08-24 21:14:09 +0200
committerBernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>2013-10-15 22:14:21 +0200
commit2da9328c626842538f536ec549aa35acd0a694e6 (patch)
tree2de10784e5d7aae8541a47c68d2bcb956e8098a8
parentffb38cbaf4dc42b3cfc107c663115b1ce236f6ab (diff)
downloadnative-2da9328c626842538f536ec549aa35acd0a694e6.tar.gz
frameworks/native: Fix build in ISO C++11 mode
Change-Id: Icc19cde1bf9c72397ed8bda545e9056483d83e8d Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
-rw-r--r--include/utils/Unicode.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/utils/Unicode.h b/include/utils/Unicode.h
index 9273533770..443f66d24d 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 *);