Auto merge of #2542 - devnexen:ftok_nbsd_obsd, r=JohnTitor

netbsd/openbsd ftok addition.
rust-lang · Nov 17, 2021 · 49e6255 · 49e6255
2 parents 9d94fb1 + c42379d
commit 49e6255
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 0 deletions.
diff --git a/libc-test/build.rs b/libc-test/build.rs
@@ -430,6 +430,7 @@ fn test_openbsd(target: &str) {
         "string.h",
         "sys/file.h",
         "sys/ioctl.h",
+        "sys/ipc.h",
         "sys/mman.h",
         "sys/param.h",
         "sys/resource.h",
@@ -993,6 +994,7 @@ fn test_netbsd(target: &str) {
         "sys/file.h",
         "sys/ioctl.h",
         "sys/ioctl_compat.h",
+        "sys/ipc.h",
         "sys/ktrace.h",
         "sys/mman.h",
         "sys/mount.h",

diff --git a/libc-test/semver/netbsd.txt b/libc-test/semver/netbsd.txt
@@ -1183,6 +1183,7 @@ forkpty
 freeifaddrs
 freelocale
 fsid_t
+ftok
 futimes
 getbootfile
 getbyteorder

diff --git a/libc-test/semver/openbsd.txt b/libc-test/semver/openbsd.txt
@@ -952,6 +952,7 @@ freelocale
 freezero
 fsid_t
 fstatfs
+ftok
 fusefs_args
 futimes
 getdomainname

diff --git a/src/unix/bsd/netbsdlike/mod.rs b/src/unix/bsd/netbsdlike/mod.rs
@@ -747,6 +747,7 @@ extern "C" {
     pub fn reallocarray(ptr: *mut ::c_void, nmemb: ::size_t, size: ::size_t) -> *mut ::c_void;
     pub fn gethostid() -> ::c_long;
     pub fn sethostid(hostid: ::c_long) -> ::c_int;
+    pub fn ftok(path: *const ::c_char, id: ::c_int) -> ::key_t;
 }
 
 cfg_if! {