diff --git a/CHANGELOG.md b/CHANGELOG.md index fb7d229975..308f929025 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ This project adheres to [Semantic Versioning](https://semver.org/). ([#2085](https://github.com/nix-rust/nix/pull/2085)) - Added `SO_RTABLE` for OpenBSD and `SO_ACCEPTFILTER` for FreeBSD/NetBSD to `nix::sys::socket::sockopt`. ([#2085](https://github.com/nix-rust/nix/pull/2085)) +- Removed `flock` from `::nix::fcntl` on Solaris. ([#2082](https://github.com/nix-rust/nix/pull/2082)) ### Changed diff --git a/src/fcntl.rs b/src/fcntl.rs index f7bb698980..85c8e1a49e 100644 --- a/src/fcntl.rs +++ b/src/fcntl.rs @@ -559,7 +559,7 @@ pub enum FlockArg { UnlockNonblock, } -#[cfg(not(target_os = "redox"))] +#[cfg(not(any(target_os = "redox", target_os = "solaris")))] pub fn flock(fd: RawFd, arg: FlockArg) -> Result<()> { use self::FlockArg::*;