From c08fb7eb45f7121db8dc19b7a65fb32e3bfdbb9a Mon Sep 17 00:00:00 2001 From: Andrew Hsieh Date: Thu, 29 Jan 2015 11:35:27 -0800 Subject: [PATCH] Fix mips64 struct stat64 Cherry pick bionic 86d2feef9f4df517dd5755b39b993bec0c3e1ea5 which fixes struct stat64. This may look like breaking mips64 ABI, but mips64 support is stil work in progress post-L Also see prebuilts/ndk e6639a4c0ba9296a19fd477154aace3585221d9d Change-Id: Ia8859762191220b9d3127b37970f05594375ca40 --- ndk/platforms/android-21/include/sys/stat.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ndk/platforms/android-21/include/sys/stat.h b/ndk/platforms/android-21/include/sys/stat.h index c0c168b2e..727da12da 100644 --- a/ndk/platforms/android-21/include/sys/stat.h +++ b/ndk/platforms/android-21/include/sys/stat.h @@ -37,7 +37,7 @@ __BEGIN_DECLS -#if defined(__aarch64__) +#if defined(__aarch64__) || (defined(__mips__) && defined(__LP64__)) #define __STAT64_BODY \ unsigned long st_dev; \ unsigned long st_ino; \ @@ -60,7 +60,7 @@ __BEGIN_DECLS unsigned int __unused4; \ unsigned int __unused5; \ -#elif defined(__mips__) +#elif defined(__mips__) && !defined(__LP64__) #define __STAT64_BODY \ unsigned int st_dev; \ unsigned int __pad0[3]; \