diff options
| author | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2013-11-05 16:14:49 +0100 |
|---|---|---|
| committer | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2013-11-05 16:14:49 +0100 |
| commit | 66f7bfec002667e837f7b3557e942907fa70a57d (patch) | |
| tree | f6fb4debcd002c2d9e7833e52a657b5dc10baac5 | |
| parent | 7603b6458a5fd234f95a8307a12b446b3c94da95 (diff) | |
| download | base-66f7bfec002667e837f7b3557e942907fa70a57d.tar.gz | |
Work around uint16_t vs. char16_t confusion
Change-Id: I188e5a82b2dba821710eaea85d6cbef2ae004ce9
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
| -rw-r--r-- | core/jni/android_view_KeyCharacterMap.cpp | 2 | ||||
| -rw-r--r-- | libs/androidfw/ResourceTypes.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/core/jni/android_view_KeyCharacterMap.cpp b/core/jni/android_view_KeyCharacterMap.cpp index d8724cba6015..04fcdd0811c4 100644 --- a/core/jni/android_view_KeyCharacterMap.cpp +++ b/core/jni/android_view_KeyCharacterMap.cpp @@ -26,6 +26,8 @@ #include "android_os_Parcel.h" #include "android_view_KeyEvent.h" +#undef char16_t + namespace android { static struct { diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp index 6ea9cbdb4b8f..d7f4bbff2845 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp @@ -17,6 +17,7 @@ #define LOG_TAG "ResourceType" //#define LOG_NDEBUG 0 +#define char16_t uint16_t #include <androidfw/ResourceTypes.h> #include <utils/Atomic.h> #include <utils/ByteOrder.h> |