From 344c3c7e7a4a46b3d99a43950742132bcd0ed706 Mon Sep 17 00:00:00 2001 From: Amanieu d'Antras Date: Wed, 5 Aug 2020 14:44:49 +0100 Subject: [PATCH 1/2] Expose SeekData and SeekHole on all Linux targets These were previously missing on musl and mips targets because of missing definitions in the libc crate. --- src/unistd.rs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/unistd.rs b/src/unistd.rs index d53b438cbd..5df3dbde83 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 } From 0139b7da21cdf0369b82456b62820c4e2a4a426c Mon Sep 17 00:00:00 2001 From: Amanieu d'Antras Date: Sat, 22 Aug 2020 21:21:33 +0100 Subject: [PATCH 2/2] Add changelog entry --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc2aeebde5..5a45317d53 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)) ### Fixed ### Removed