| commit | b67a0e76bd36c6abab21e62b6815ff8a367de084 | [log] [tgz] |
|---|---|---|
| author | Lai Wei-Chih <Robert.Lai@mediatek.com> | Thu Aug 08 12:00:02 2013 +0800 |
| committer | Lai Wei-Chih <Robert.Lai@mediatek.com> | Wed Aug 21 11:35:26 2013 +0800 |
| tree | 7a03f1943e041cee3cec513f04c5833545d66653 | |
| parent | 54f01d45c919f482fbbbd351dbd49c037e5ada06 [diff] |
Fix wchar_t-size for le32. Change-Id: I7791e7919b1feb93e59e9e3932597ec0673a723f
diff --git a/tests/build/wchar_t-size/jni/test_8bit.c b/tests/build/wchar_t-size/jni/test_8bit.c index 7089e1d..c380420 100644 --- a/tests/build/wchar_t-size/jni/test_8bit.c +++ b/tests/build/wchar_t-size/jni/test_8bit.c
@@ -17,7 +17,7 @@ #define STATIC_ASSERT(condition) \ static char CONCAT(dummy_,__LINE__)[1 - 2*(!(condition))]; -#ifdef __arm__ +#if defined(__arm__) || __ANDROID_API__ < 9 STATIC_ASSERT(sizeof(__WCHAR_TYPE__) == 1); STATIC_ASSERT(sizeof(wchar_t) == 1); #else
diff --git a/tests/build/wchar_t-size/jni/test_8bit_cplusplus.cpp b/tests/build/wchar_t-size/jni/test_8bit_cplusplus.cpp index 3396aab..2776bf3 100644 --- a/tests/build/wchar_t-size/jni/test_8bit_cplusplus.cpp +++ b/tests/build/wchar_t-size/jni/test_8bit_cplusplus.cpp
@@ -17,7 +17,7 @@ #define STATIC_ASSERT(condition) \ static char CONCAT(dummy_,__LINE__)[1 - 2*(!(condition))]; -#ifdef __arm__ +#if defined(__arm__) || __ANDROID_API__ < 9 STATIC_ASSERT(sizeof(__WCHAR_TYPE__) == 1); #else STATIC_ASSERT(sizeof(__WCHAR_TYPE__) == 4);
diff --git a/tests/build/wchar_t-size/jni/test_8bit_cplusplus_stdc_limit_macros.cpp b/tests/build/wchar_t-size/jni/test_8bit_cplusplus_stdc_limit_macros.cpp index 06c1c33..23eddd4 100644 --- a/tests/build/wchar_t-size/jni/test_8bit_cplusplus_stdc_limit_macros.cpp +++ b/tests/build/wchar_t-size/jni/test_8bit_cplusplus_stdc_limit_macros.cpp
@@ -19,7 +19,7 @@ #define STATIC_ASSERT(condition) \ static char CONCAT(dummy_,__LINE__)[1 - 2*(!(condition))]; -#ifdef __arm__ +#if defined(__arm__) || __ANDROID_API__ < 9 STATIC_ASSERT(sizeof(__WCHAR_TYPE__) == 1); #else STATIC_ASSERT(sizeof(__WCHAR_TYPE__) == 4);