summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2015-01-29 19:13:57 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-01-29 19:13:57 +0000
commitd7a0f45a1fcaec2fafc67c2fd72ae6af86fc5090 (patch)
tree19d43e64e40a1c8289503eeec1bc74764f77c71e
parent01eb5b04a583398a2c1d98e2fddfbc019ca663d4 (diff)
parente6639a4c0ba9296a19fd477154aace3585221d9d (diff)
downloadprebuilts_ndk-d7a0f45a1fcaec2fafc67c2fd72ae6af86fc5090.zip
prebuilts_ndk-d7a0f45a1fcaec2fafc67c2fd72ae6af86fc5090.tar.gz
prebuilts_ndk-d7a0f45a1fcaec2fafc67c2fd72ae6af86fc5090.tar.bz2
Merge "Modify MIPS64 stat structure inline with the one in bionic."
-rw-r--r--9/platforms/android-21/arch-mips64/usr/include/sys/stat.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/9/platforms/android-21/arch-mips64/usr/include/sys/stat.h b/9/platforms/android-21/arch-mips64/usr/include/sys/stat.h
index c0c168b..727da12 100644
--- a/9/platforms/android-21/arch-mips64/usr/include/sys/stat.h
+++ b/9/platforms/android-21/arch-mips64/usr/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]; \