diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-02-09 16:02:40 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-02-09 16:02:40 +0000 |
| commit | e2c19c630c3ac392b3eea4e075c6c3b16e84e12a (patch) | |
| tree | b03f48df7b36aa58b0301b01878eca7b129b2541 | |
| parent | dab0a5e52266f014bdf52c3181d30f068b050250 (diff) | |
| parent | 08624d0a5c3649fea6463836690ae9b7f01093ac (diff) | |
| download | nix-e2c19c630c3ac392b3eea4e075c6c3b16e84e12a.zip | |
Merge #832
832: make statfs/statvfs to be available everywhere r=asomers a=ignatenkobrain
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 <i.gnatenko.brain@gmail.com>
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | src/sys/mod.rs | 12 | ||||
| -rw-r--r-- | src/sys/statvfs.rs | 6 |
3 files changed, 6 insertions, 14 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a446f2be..2c016de3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Added `alarm`. ([#830](https://github.com/nix-rust/nix/pull/830)) - Added interface flags `IFF_NO_PI, IFF_TUN, IFF_TAP` on linux-like systems. ([#853](https://github.com/nix-rust/nix/pull/853)) +- Added `statvfs` module to all MacOS and Linux architectures. + ([#832](https://github.com/nix-rust/nix/pull/832)) ### Changed - Display and Debug for SysControlAddr now includes all fields. diff --git a/src/sys/mod.rs b/src/sys/mod.rs index 55c3d5d2..972a1b5e 100644 --- a/src/sys/mod.rs +++ b/src/sys/mod.rs @@ -54,19 +54,9 @@ pub mod socket; pub mod stat; -#[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 termios; diff --git a/src/sys/statvfs.rs b/src/sys/statvfs.rs index 41ca44f2..845ae0db 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"))] |