Skip to content

Commit

Permalink
Merge pull request #2082 from inferiorhumanorgans/solaris-no-flock
Browse files Browse the repository at this point in the history
Don't build flock on Solaris
  • Loading branch information
asomers authored Aug 7, 2023
2 parents 1052977 + 5e7bfd5 commit 783e38d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/fcntl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::*;

Expand Down

0 comments on commit 783e38d

Please sign in to comment.