From 340c5742ce33fe633e74d0273f341d1653ebeff4 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 8 Jan 2018 00:13:59 +0100 Subject: [PATCH] make statfs/statvfs to be available wherever they are available libc reads sys/statvfs.h on all OS except Windows which nix doesn't care about. Closes: https://github.com/nix-rust/nix/issues/831 Signed-off-by: Igor Gnatenko (cherry picked from commit 08624d0a5c3649fea6463836690ae9b7f01093ac) --- src/sys/mod.rs | 13 +------------ src/sys/statvfs.rs | 6 +++--- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/sys/mod.rs b/src/sys/mod.rs index a94b8a0..395f04e 100644 --- a/src/sys/mod.rs +++ b/src/sys/mod.rs @@ -63,19 +63,8 @@ pub mod select; pub mod quota; -#[cfg(all(target_os = "linux", - any(target_arch = "x86", - target_arch = "x86_64", - target_arch = "arm")), - )] +#[cfg(any(target_os = "android", target_os = "linux", target_os = "macos"))] pub mod statfs; - -#[cfg(all(any(target_os = "linux", - target_os = "macos"), - any(target_arch = "x86", - target_arch = "x86_64", - target_arch = "arm")), - )] pub mod statvfs; pub mod pthread; diff --git a/src/sys/statvfs.rs b/src/sys/statvfs.rs index fbd0570..c1c66de 100644 --- a/src/sys/statvfs.rs +++ b/src/sys/statvfs.rs @@ -32,13 +32,13 @@ libc_bitflags!( #[cfg(any(target_os = "android", target_os = "linux"))] ST_MANDLOCK; /// Write on file/directory/symlink - #[cfg(any(target_os = "android", target_os = "linux"))] + #[cfg(target_os = "linux")] ST_WRITE; /// Append-only file - #[cfg(any(target_os = "android", target_os = "linux"))] + #[cfg(target_os = "linux")] ST_APPEND; /// Immutable file - #[cfg(any(target_os = "android", target_os = "linux"))] + #[cfg(target_os = "linux")] ST_IMMUTABLE; /// Do not update access times on files #[cfg(any(target_os = "android", target_os = "linux"))] -- 2.16.2