diff options
| author | Baoshan <pangbw@gmail.com> | 2019-09-28 19:26:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-28 19:26:32 -0700 |
| commit | a38aa537bda7f78f35c688dc3a67cc3f43909217 (patch) | |
| tree | 0bffe1008ac556df8b63ec5ba0c177f961dadd14 | |
| parent | fbf7d5e90f0f417c0d56245a827e61583d7bf786 (diff) | |
| parent | ff63cb517872d95bdba9960d4d200d024c1805a0 (diff) | |
| download | rust-libc-a38aa537bda7f78f35c688dc3a67cc3f43909217.tar.gz | |
Merge pull request #19 from rust-lang/master
sync with rust-lang/libc master
| -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")] |