about summary refs log tree commit diff
diff options
context:
space:
mode:
m---------src/liblibc0
-rw-r--r--src/libstd/sys/unix/fs.rs5
2 files changed, 4 insertions, 1 deletions
diff --git a/src/liblibc b/src/liblibc
-Subproject 403bdc88394919f297bdb365032044cc0481c31
+Subproject 1b1eea2cdd77c63d73ba0b09b905a91910d1c99
diff --git a/src/libstd/sys/unix/fs.rs b/src/libstd/sys/unix/fs.rs
index e8e0a604e55..e5bdfa3ac88 100644
--- a/src/libstd/sys/unix/fs.rs
+++ b/src/libstd/sys/unix/fs.rs
@@ -27,7 +27,10 @@ use sys_common::{AsInner, FromInner};
 
 #[cfg(target_os = "linux")]
 use libc::{stat64, fstat64, lstat64, off64_t, ftruncate64, lseek64, dirent64, readdir64_r, open64};
-#[cfg(not(target_os = "linux"))]
+#[cfg(target_os = "android")]
+use libc::{stat as stat64, fstat as fstat64, lstat as lstat64, off64_t, ftruncate64, lseek64,
+           dirent as dirent64, open as open64};
+#[cfg(not(any(target_os = "linux", target_os = "android")))]
 use libc::{stat as stat64, fstat as fstat64, lstat as lstat64, off_t as off64_t,
            ftruncate as ftruncate64, lseek as lseek64, dirent as dirent64, open as open64};
 #[cfg(not(any(target_os = "linux", target_os = "solaris")))]