Skip to content

Commit

Permalink
Merge #1635
Browse files Browse the repository at this point in the history
1635: Remove EventFlag::EV_SYSFLAG r=rtzoeller a=rtzoeller

It is not stable across OpenBSD versions and is reserved by the system on FreeBSD and NetBSD.

This should fix the nix build for OpenBSD, which is failing due to rust-lang/libc#2596. Bump the libc dependency to uptake that change.

Co-authored-by: Ryan Zoeller <rtzoeller@rtzoeller.com>
  • Loading branch information
bors[bot] and rtzoeller authored Jan 18, 2022
2 parents 916bbfa + 84e3c56 commit 18d1f62
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
- Removed public access to the inner fields of `NetlinkAddr`, `AlgAddr`,
`SysControlAddr`, `LinkAddr`, and `VsockAddr`.
(#[1614](https://github.com/nix-rust/nix/pull/1614))
- Removed `EventFlag::EV_SYSFLAG`.
(#[1635](https://github.com/nix-rust/nix/pull/1635))

## [0.23.1] - 2021-12-16

Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ targets = [
]

[dependencies]
libc = { version = "0.2.112", features = [ "extra_traits" ] }
libc = { git = "https://github.com/rust-lang/libc", rev = "e470e3b6a1f940e0024d40d3b79fc73fe29c7f17", features = [ "extra_traits" ] }
bitflags = "1.1"
cfg-if = "1.0"

Expand Down
1 change: 0 additions & 1 deletion src/sys/event.rs
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ libc_bitflags!{
target_os = "ios", target_os = "macos",
target_os = "netbsd", target_os = "openbsd"))]
EV_RECEIPT;
EV_SYSFLAGS;
}
}

Expand Down

0 comments on commit 18d1f62

Please sign in to comment.