diff options
| author | bors <bors@rust-lang.org> | 2021-06-07 07:01:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-06-07 07:01:35 +0000 |
| commit | c02c8f8750f40f2e6af580dd8c79d324e15ae70b (patch) | |
| tree | 5b393a2fa38d9de8e75cb92347d07901cc8f2c34 | |
| parent | f9ee729a53744048c1c529fefd28de3fd24faa5f (diff) | |
| parent | 108192d96f26a3c83ca1128e5f96814eb160c47d (diff) | |
| download | rust-libc-c02c8f8750f40f2e6af580dd8c79d324e15ae70b.tar.gz | |
Auto merge of #2219 - devnexen:mremap_netbsd, r=JohnTitor
netbsd add mremap and its particular flag. little note on kevent.
| -rw-r--r-- | libc-test/semver/netbsd.txt | 1 | ||||
| -rw-r--r-- | src/unix/bsd/netbsdlike/netbsd/mod.rs | 11 |
2 files changed, 11 insertions, 1 deletions
diff --git a/libc-test/semver/netbsd.txt b/libc-test/semver/netbsd.txt index dbee2f6bea..408cd9cb4c 100644 --- a/libc-test/semver/netbsd.txt +++ b/libc-test/semver/netbsd.txt @@ -546,6 +546,7 @@ MADV_WILLNEED MAP_FILE MAP_HASSEMAPHORE MAP_NORESERVE +MAP_REMAPDUP MAP_RENAME MAP_WIRED MAXFREQ diff --git a/src/unix/bsd/netbsdlike/netbsd/mod.rs b/src/unix/bsd/netbsdlike/netbsd/mod.rs index ce5045da40..626b2cafd3 100644 --- a/src/unix/bsd/netbsdlike/netbsd/mod.rs +++ b/src/unix/bsd/netbsdlike/netbsd/mod.rs @@ -213,7 +213,7 @@ s! { pub flags: u32, pub fflags: u32, pub data: i64, - pub udata: ::intptr_t, + pub udata: ::intptr_t, /* FIXME: NetBSD 10.0 will finally have same layout as other BSD */ } pub struct dqblk { @@ -1204,6 +1204,8 @@ pub const MAP_RENAME: ::c_int = 0x20; pub const MAP_NORESERVE: ::c_int = 0x40; pub const MAP_HASSEMAPHORE: ::c_int = 0x200; pub const MAP_WIRED: ::c_int = 0x800; +// mremap flag +pub const MAP_REMAPDUP: ::c_int = 0x004; pub const DCCP_TYPE_REQUEST: ::c_int = 0; pub const DCCP_TYPE_RESPONSE: ::c_int = 1; @@ -2116,6 +2118,13 @@ extern "C" { pub fn consttime_memequal(a: *const ::c_void, b: *const ::c_void, len: ::size_t) -> ::c_int; pub fn setproctitle(fmt: *const ::c_char, ...); + pub fn mremap( + oldp: *mut ::c_void, + oldsize: ::size_t, + newp: *mut ::c_void, + newsize: ::size_t, + flags: ::c_int, + ) -> *mut ::c_void; } #[link(name = "util")] |