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: #831
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>

CHANGELOG.md

@@ -10,6 +10,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 
 ### Fixed
+- Fix `statvfs` module to be available on all supported platforms.
+  ([#832](https://github.com/nix-rust/nix/pull/832))
 
 ### Removed
 

src/sys/mod.rs

@@ -62,20 +62,9 @@ pub mod select;
 #[cfg(target_os = "linux")]
 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;

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"))]