aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-10-23 22:31:33 +0200
committerBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-10-23 22:31:33 +0200
commita564c08349253436c0d2fe6fae5f01fc14b6daa2 (patch)
tree595d8c8b34dd65d195705badf4a8468532c55b75
parent059aea7c8413144e85d472a4810b0e6eddbfc86c (diff)
downloadAndroidTerm-a564c08349253436c0d2fe6fae5f01fc14b6daa2.tar.gz
termExec: Fix build with C++11 compliant compilers
Change-Id: Ia2abe403a510de6fd0921f285de2c69f9a2c2bc5 Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
-rw-r--r--jni/termExec.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/jni/termExec.cpp b/jni/termExec.cpp
index 0f9c79e..d5dc232 100644
--- a/jni/termExec.cpp
+++ b/jni/termExec.cpp
@@ -50,7 +50,7 @@ static jclass class_fileDescriptor;
static jfieldID field_fileDescriptor_descriptor;
static jmethodID method_fileDescriptor_init;
-typedef unsigned short char16_t;
+#define char16_t uint16_t // WAS: typedef unsigned short char16_t; (changed because char16_t already exists in C++11)
class String8 {
public: