diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-05-06 19:26:58 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-05-06 19:26:58 +0000 |
| commit | 8a5a7625132b7ec9c3334fbf10b78123dbc0ee48 (patch) | |
| tree | 99cc56ac64c649d8fe00b52c44c156f805218951 | |
| parent | 15168e51fe120987c1a45cc3ef6f6597944ddbd1 (diff) | |
| parent | c838e64517ddfcaf7a45622c92af3a4a46d46fdd (diff) | |
| download | nix-8a5a7625132b7ec9c3334fbf10b78123dbc0ee48.zip | |
Merge #893
893: Remove IFF_NOTRAILERS for openbsd r=asomers a=kpcyrd
nix currently doesn't compile on openbsd because `IFF_NOTRAILERS` isn't found. This PR fixes the openbsd build again (tested on 6.3). It seems it was changed in this commit:
https://github.com/openbsd/src/commit/beb8b0dd5985e55a615b52e593da6e75bab33f3f
Co-authored-by: kpcyrd <git@rxv.cc>
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | src/net/if_.rs | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index fb344839..350d18f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,6 +47,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). ([#833](https://github.com/nix-rust/nix/pull/833)) - Enabled more `ptrace::Request` definitions for uncommon Linux platforms ([#892](https://github.com/nix-rust/nix/pull/892)) +- Remove `IFF_NOTRAILERS` on OpenBSD, as it has been removed in OpenBSD 6.3 + ([#893](https://github.com/nix-rust/nix/pull/893)) ### Fixed - Fixed possible panics when using `SigAction::flags` on Linux diff --git a/src/net/if_.rs b/src/net/if_.rs index 0da9016a..714eac77 100644 --- a/src/net/if_.rs +++ b/src/net/if_.rs @@ -44,7 +44,6 @@ libc_bitflags!( target_os = "linux", target_os = "macos", target_os = "netbsd", - target_os = "openbsd", target_os = "solaris"))] IFF_NOTRAILERS; /// Interface manages own routes. |