diff options
author | bors <bors@rust-lang.org> | 2019-09-28 09:51:00 +0000 |
---|---|---|
committer | bors <bors@rust-lang.org> | 2019-09-28 09:51:00 +0000 |
commit | ff63cb517872d95bdba9960d4d200d024c1805a0 (patch) | |
tree | 0bffe1008ac556df8b63ec5ba0c177f961dadd14 | |
parent | f6ed4e01e02139dae2efb336c45b657fdec6cf6c (diff) | |
parent | 36a92d5278fa1b908632ea3bcaafec7b2ef0a102 (diff) | |
download | rust-libc-ff63cb517872d95bdba9960d4d200d024c1805a0.tar.gz |
Auto merge of #1533 - murarth:bsd-pthread-main-np, r=asomers
Add `pthread_main_np` to FreeBSD-like and `_lwp_self` to NetBSD
-rw-r--r-- | src/unix/bsd/freebsdlike/mod.rs | 1 | ||||
-rw-r--r-- | src/unix/bsd/netbsdlike/netbsd/mod.rs | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/unix/bsd/freebsdlike/mod.rs b/src/unix/bsd/freebsdlike/mod.rs index cfb8a4e169..1b7804cb27 100644 --- a/src/unix/bsd/freebsdlike/mod.rs +++ b/src/unix/bsd/freebsdlike/mod.rs @@ -1323,6 +1323,7 @@ extern "C" { attr: *mut pthread_condattr_t, pshared: ::c_int, ) -> ::c_int; + pub fn pthread_main_np() -> ::c_int; pub fn pthread_mutex_timedlock( lock: *mut pthread_mutex_t, abstime: *const ::timespec, diff --git a/src/unix/bsd/netbsdlike/netbsd/mod.rs b/src/unix/bsd/netbsdlike/netbsd/mod.rs index ba28bce19e..97e2634ad8 100644 --- a/src/unix/bsd/netbsdlike/netbsd/mod.rs +++ b/src/unix/bsd/netbsdlike/netbsd/mod.rs @@ -8,6 +8,7 @@ pub type idtype_t = ::c_int; pub type mqd_t = ::c_int; type __pthread_spin_t = __cpu_simple_lock_nv_t; pub type vm_size_t = ::uintptr_t; +pub type lwpid_t = ::c_uint; impl siginfo_t { pub unsafe fn si_value(&self) -> ::sigval { @@ -1714,6 +1715,8 @@ extern "C" { flags: ::c_int, timeout: *mut ::timespec, ) -> ::c_int; + + pub fn _lwp_self() -> lwpid_t; } #[link(name = "util")] |