Skip to content

Commit 8fd4fa1

Browse files
committed
Auto merge of #3490 - lcheylus:openbsd-waitid, r=JohnTitor
Add waitid function for OpenBSD To compile on OpenBSD a Rust project using [shared_child](https://docs.rs/shared_child/) crate, I need `waitid` libc function. - Same prototype for `waitid` function on NetBSD and OpenBSD. - To support it on OpenBSD, move definition from `src/unix/bsd/netbsdlike/netbsd/mod.rs` to `src/unix/bsd/netbsdlike/mod.rs` => available on both BSD OS
2 parents 42a7ec1 + 4e0bfc4 commit 8fd4fa1

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

libc-test/semver/openbsd.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1274,4 +1274,5 @@ utimensat
12741274
utmp
12751275
utrace
12761276
wait4
1277+
waitid
12771278
xucred

src/unix/bsd/netbsdlike/mod.rs

+6
Original file line numberDiff line numberDiff line change
@@ -747,6 +747,12 @@ extern "C" {
747747
argv: *const *const ::c_char,
748748
envp: *const *const ::c_char,
749749
) -> ::c_int;
750+
pub fn waitid(
751+
idtype: idtype_t,
752+
id: ::id_t,
753+
infop: *mut ::siginfo_t,
754+
options: ::c_int,
755+
) -> ::c_int;
750756
}
751757

752758
extern "C" {

src/unix/bsd/netbsdlike/netbsd/mod.rs

-6
Original file line numberDiff line numberDiff line change
@@ -2776,12 +2776,6 @@ extern "C" {
27762776
timeout: *const ::timespec,
27772777
) -> ::c_int;
27782778
pub fn sigwaitinfo(set: *const sigset_t, info: *mut siginfo_t) -> ::c_int;
2779-
pub fn waitid(
2780-
idtype: idtype_t,
2781-
id: ::id_t,
2782-
infop: *mut ::siginfo_t,
2783-
options: ::c_int,
2784-
) -> ::c_int;
27852779

27862780
pub fn duplocale(base: ::locale_t) -> ::locale_t;
27872781
pub fn freelocale(loc: ::locale_t);

0 commit comments

Comments
 (0)