diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-06-03 07:33:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-03 07:33:17 +0000 |
| commit | 80bc93153df481a2bb86bc2f384af681836f37a5 (patch) | |
| tree | bea14c2a1c1e70576e405f26549ccfc4a97f4a93 /ndk | |
| parent | 7f4142f25e7f9510b0e3e484a0a3ae70cd03d567 (diff) | |
| parent | e85f942ec6828c1b582c5fa72caeda9c77061c07 (diff) | |
Merge "Fix warning about undefined __LP64__"
Diffstat (limited to 'ndk')
| -rw-r--r-- | ndk/platforms/android-20/include/sys/cdefs.h | 2 | ||||
| -rw-r--r-- | ndk/platforms/android-3/include/sys/cdefs.h | 2 | ||||
| -rw-r--r-- | ndk/platforms/android-9/include/sys/cdefs.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ndk/platforms/android-20/include/sys/cdefs.h b/ndk/platforms/android-20/include/sys/cdefs.h index 37c43cfe0..9c92a1c33 100644 --- a/ndk/platforms/android-20/include/sys/cdefs.h +++ b/ndk/platforms/android-20/include/sys/cdefs.h @@ -578,7 +578,7 @@ #define __BIONIC_FORTIFY_UNKNOWN_SIZE ((size_t) -1) -#if defined(__ANDROID__) && !__LP64__ && defined( __arm__) +#if defined(__ANDROID__) && !defined(__LP64__) && defined( __arm__) #define __NDK_FPABI__ __attribute__((pcs("aapcs"))) #else #define __NDK_FPABI__ diff --git a/ndk/platforms/android-3/include/sys/cdefs.h b/ndk/platforms/android-3/include/sys/cdefs.h index e84006435..10743f6d2 100644 --- a/ndk/platforms/android-3/include/sys/cdefs.h +++ b/ndk/platforms/android-3/include/sys/cdefs.h @@ -545,7 +545,7 @@ ^ a.i:564:6: note: previous declaration is here */ -#if defined(__ANDROID__) && !__LP64__ && defined( __arm__) +#if defined(__ANDROID__) && !defined(__LP64__) && defined( __arm__) #define __NDK_FPABI__ __attribute__((pcs("aapcs"))) #else #define __NDK_FPABI__ diff --git a/ndk/platforms/android-9/include/sys/cdefs.h b/ndk/platforms/android-9/include/sys/cdefs.h index beb35c41b..e17e36143 100644 --- a/ndk/platforms/android-9/include/sys/cdefs.h +++ b/ndk/platforms/android-9/include/sys/cdefs.h @@ -514,7 +514,7 @@ ^ a.i:564:6: note: previous declaration is here */ -#if defined(__ANDROID__) && !__LP64__ && defined( __arm__) +#if defined(__ANDROID__) && !defined(__LP64__) && defined( __arm__) #define __NDK_FPABI__ __attribute__((pcs("aapcs"))) #else #define __NDK_FPABI__ |