diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2015-01-29 19:25:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-29 19:25:07 +0000 |
| commit | b0b8d245896000ddc49633e33227596a69483df1 (patch) | |
| tree | 19d43e64e40a1c8289503eeec1bc74764f77c71e | |
| parent | 7393957714b3cab4e290a1ae5fcf4e39944dab0d (diff) | |
| parent | d7a0f45a1fcaec2fafc67c2fd72ae6af86fc5090 (diff) | |
| download | prebuilts_ndk-b0b8d245896000ddc49633e33227596a69483df1.tar.gz prebuilts_ndk-b0b8d245896000ddc49633e33227596a69483df1.tar.bz2 prebuilts_ndk-b0b8d245896000ddc49633e33227596a69483df1.zip | |
am d7a0f45a: Merge "Modify MIPS64 stat structure inline with the one in bionic."
* commit 'd7a0f45a1fcaec2fafc67c2fd72ae6af86fc5090':
Modify MIPS64 stat structure inline with the one in bionic.
| -rw-r--r-- | 9/platforms/android-21/arch-mips64/usr/include/sys/stat.h | 4 |
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 c0c168b2..727da12d 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]; \ |