diff options
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | src/unistd.rs | 10 |
2 files changed, 5 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 686b2059..061d1b9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,12 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] - ReleaseDate +### Added - Added Netlink protocol families to the `SockProtocol` enum (#[1289](https://github.com/nix-rust/nix/pull/1289)) -### Added ### Changed +- Expose `SeekData` and `SeekHole` on all Linux targets +(#[1284](https://github.com/nix-rust/nix/pull/1284)) - Changed unistd::{execv,execve,execvp,execvpe,fexecve,execveat} to take both `&[&CStr]` and `&[CString]` as its list argument(s). (#[1278](https://github.com/nix-rust/nix/pull/1278)) ### Fixed diff --git a/src/unistd.rs b/src/unistd.rs index 06f997f4..4a7903a3 100644 --- a/src/unistd.rs +++ b/src/unistd.rs @@ -1018,20 +1018,14 @@ pub enum Whence { /// Specify an offset relative to the next location in the file greater than or /// equal to offset that contains some data. If offset points to /// some data, then the file offset is set to offset. - #[cfg(any(target_os = "dragonfly", target_os = "freebsd", - all(target_os = "linux", not(any(target_env = "musl", - target_arch = "mips", - target_arch = "mips64")))))] + #[cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "linux"))] SeekData = libc::SEEK_DATA, /// Specify an offset relative to the next hole in the file greater than /// or equal to offset. If offset points into the middle of a hole, then /// the file offset should be set to offset. If there is no hole past offset, /// then the file offset should be adjusted to the end of the file (i.e., there /// is an implicit hole at the end of any file). - #[cfg(any(target_os = "dragonfly", target_os = "freebsd", - all(target_os = "linux", not(any(target_env = "musl", - target_arch = "mips", - target_arch = "mips64")))))] + #[cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "linux"))] SeekHole = libc::SEEK_HOLE } |