am 172b2a28: am 80bc9315: Merge "Fix warning about undefined __LP64__"

* commit '172b2a282238548d90a0fb35190e3dd066d831fa':
  Fix warning about undefined __LP64__
This commit is contained in:
Andrew Hsieh
2014-06-03 11:11:35 +00:00
committed by Android Git Automerger
3 changed files with 3 additions and 3 deletions

View File

@@ -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__

View File

@@ -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__

View File

@@ -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__