diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-06-03 11:11:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-03 11:11:35 +0000 |
| commit | d3b356b67d23b85841f50001c487c8946a2ae635 (patch) | |
| tree | e37b97904b8e274f855e8161d66295a649783aed /ndk | |
| parent | 880ff4ab335ceb843b43b82d3dee5fb485a749b0 (diff) | |
| parent | 172b2a282238548d90a0fb35190e3dd066d831fa (diff) | |
am 172b2a28: am 80bc9315: Merge "Fix warning about undefined __LP64__"
* commit '172b2a282238548d90a0fb35190e3dd066d831fa':
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__ |