Skip to content

Commit

Permalink
Merge #1525
Browse files Browse the repository at this point in the history
1525: mman: add MAP_EXCL flag for freebsd. r=asomers a=devnexen



Co-authored-by: David Carlier <[email protected]>
  • Loading branch information
bors[bot] and devnexen authored Sep 18, 2021
2 parents 781ab2e + 63d4094 commit 86fec80
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
(#[1516](https://github.com/nix-rust/nix/pull/1516))
- Added `Ipv4Ttl` and `Ipv6Ttl` sockopts.
(#[1515](https://github.com/nix-rust/nix/pull/1515))
- Added `MAP_EXCL` mmap flag for freebsd.
(#[1525](https://github.com/nix-rust/nix/pull/1525))

### Changed

Expand Down
4 changes: 4 additions & 0 deletions src/sys/mman.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ libc_bitflags!{
MAP_PRIVATE;
/// Place the mapping at exactly the address specified in `addr`.
MAP_FIXED;
/// To be used with `MAP_FIXED`, to forbid the system
/// to select a different address than the one specified.
#[cfg(target_os = "freebsd")]
MAP_EXCL;
/// Synonym for `MAP_ANONYMOUS`.
MAP_ANON;
/// The mapping is not backed by any file.
Expand Down

0 comments on commit 86fec80

Please sign in to comment.