Skip to content

Commit

Permalink
Merge #728 #731
Browse files Browse the repository at this point in the history
728: Use upstream libc ptrace FFI r=Susurrus

This might fail on Mac because of how libc defines ptrace on that platform, but we'll see!

731: Use upstream libc definitions in mman module r=asomers
  • Loading branch information
bors[bot] committed Aug 11, 2017
3 parents 7324888 + 50fdc68 + 0e0de31 commit 5a54f9f
Show file tree
Hide file tree
Showing 3 changed files with 217 additions and 194 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
`statvfs::vfs` module. Additionally `(f)statvfs()` now return the struct
directly. And the returned `Statvfs` struct now exposes its data through
accessor methods. ([#729](https://github.com/nix-rust/nix/pull/729))
- The `addr` argument to `madvise` and `msync` is now `*mut` to better match the
libc API. ([#731](https://github.com/nix-rust/nix/pull/731))
- `shm_open` and `shm_unlink` are no longer exposed on Android targets, where
they are not officially supported. ([#731](https://github.com/nix-rust/nix/pull/731))
- `MapFlags`, `MmapAdvise`, and `MsFlags` expose some more variants and only
officially-supported variants are provided for each target.
([#731](https://github.com/nix-rust/nix/pull/731))

# Fixed
- Fix compilation and tests for OpenBSD targets
Expand Down
Loading

0 comments on commit 5a54f9f

Please sign in to comment.