diff options
author | bors <bors@rust-lang.org> | 2022-01-16 23:33:36 +0000 |
---|---|---|
committer | bors <bors@rust-lang.org> | 2022-01-16 23:33:36 +0000 |
commit | e469fc25f719313b4ad00bf4f7efb1004fc70f58 (patch) | |
tree | 652590ebea6adcefd239d8f50dfc1550d2ff4e50 | |
parent | 805321e2333c86aed19a507650f57b2cdfa6b315 (diff) | |
parent | 5d9ec7b499dc67968d4ee382545018e5d32eac37 (diff) | |
download | rust-libc-e469fc25f719313b4ad00bf4f7efb1004fc70f58.tar.gz |
Auto merge of #2628 - devnexen:netbsd_prot_mprotect, r=Amanieu
netbsd add PROT_MPROTECT macros.
-rw-r--r-- | libc-test/semver/netbsd.txt | 1 | ||||
-rw-r--r-- | src/unix/bsd/netbsdlike/netbsd/mod.rs | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/libc-test/semver/netbsd.txt b/libc-test/semver/netbsd.txt index 806fce286a..90d773dc4f 100644 --- a/libc-test/semver/netbsd.txt +++ b/libc-test/semver/netbsd.txt @@ -765,6 +765,7 @@ POSIX_SPAWN_SETSCHEDPARAM POSIX_SPAWN_SETSCHEDULER POSIX_SPAWN_SETSIGDEP POSIX_SPAWN_SETSIGMASK +PROT_MPROTECT PTHREAD_CREATE_DETACHED PTHREAD_CREATE_JOINABLE PTHREAD_MUTEX_DEFAULT diff --git a/src/unix/bsd/netbsdlike/netbsd/mod.rs b/src/unix/bsd/netbsdlike/netbsd/mod.rs index 1ede151b40..a7c2440f13 100644 --- a/src/unix/bsd/netbsdlike/netbsd/mod.rs +++ b/src/unix/bsd/netbsdlike/netbsd/mod.rs @@ -2105,6 +2105,14 @@ f! { }; ::mem::size_of::<sockcred>() + ::mem::size_of::<::gid_t>() * ngrps } + + pub fn PROT_MPROTECT(x: ::c_int) -> ::c_int { + x << 3 + } + + pub fn PROT_MPROTECT_EXTRACT(x: ::c_int) -> ::c_int { + (x >> 3) & 0x7 + } } safe_f! { |