diff options
| author | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2013-11-05 16:14:49 +0100 |
|---|---|---|
| committer | Ubuntu <vishal.bhoj@linaro.org> | 2014-06-05 09:53:13 +0000 |
| commit | 48c075b51e61f19ac020625d319adfba8235c24c (patch) | |
| tree | 725f1abc3cefc05b62aec58efb83c43b071d5cbe | |
| parent | 6b880b283dc0ad84aa02874618ec5998d9669ea1 (diff) | |
| download | base-linaro_android_4.4.3.tar.gz | |
Work around uint16_t vs. char16_t confusionlinaro_android_4.4.3
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> |