Skip to content

Commit

Permalink
Auto merge of #3399 - devnexen:fbsd_prot_max, r=JohnTitor
Browse files Browse the repository at this point in the history
freebsd adding PROT_MAX|PROT_MAX_EXTRACT mmap flags
  • Loading branch information
bors committed Oct 28, 2023
2 parents 77a5c7e + 79ff538 commit 7cfde68
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
2 changes: 2 additions & 0 deletions libc-test/semver/freebsd.txt
Expand Up @@ -972,6 +972,8 @@ PROC_WX_MAPPINGS_PERMIT
PROC_WXMAP_CTL
PROC_WXMAP_STATUS
PROC_WXORX_ENFORCE
PROT_MAX
PROT_MAX_EXTRACT
PTHREAD_CREATE_DETACHED
PTHREAD_CREATE_JOINABLE
PTHREAD_MUTEX_ADAPTIVE_NP
Expand Down
8 changes: 8 additions & 0 deletions src/unix/bsd/freebsdlike/freebsd/mod.rs
Expand Up @@ -4857,6 +4857,14 @@ f! {
};
::mem::size_of::<sockcred2>() + ::mem::size_of::<::gid_t>() * ngrps
}

pub fn PROT_MAX(x: ::c_int) -> ::c_int {
x << 16
}

pub fn PROT_MAX_EXTRACT(x: ::c_int) -> ::c_int {
(x >> 16) & (::PROT_READ | ::PROT_WRITE | ::PROT_EXEC)
}
}

safe_f! {
Expand Down

0 comments on commit 7cfde68

Please sign in to comment.