diff options
| author | Sébastien Marie <semarie@users.noreply.github.com> | 2015-02-01 14:58:57 +0100 |
|---|---|---|
| committer | Sébastien Marie <semarie@users.noreply.github.com> | 2015-02-01 15:34:59 +0100 |
| commit | f6414b0187bfc6e5b563a17c85a9f790d6257551 (patch) | |
| tree | 2a488c75cce82f522d3c8d4ca19f345b97306bff /src/libstd/sys | |
| parent | fdb5d77d0921f70d4c7b6b1ace15b5d481a6b732 (diff) | |
| download | rust-f6414b0187bfc6e5b563a17c85a9f790d6257551.tar.gz rust-f6414b0187bfc6e5b563a17c85a9f790d6257551.zip | |
openbsd: rebase to master
- incoporate changes introduced by #21678
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/unix/thread.rs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/libstd/sys/unix/thread.rs b/src/libstd/sys/unix/thread.rs index 433c37a97f3..6f030ee91fe 100644 --- a/src/libstd/sys/unix/thread.rs +++ b/src/libstd/sys/unix/thread.rs @@ -248,7 +248,9 @@ pub unsafe fn set_name(name: &str) { } } -#[cfg(any(target_os = "freebsd", target_os = "dragonfly"))] +#[cfg(any(target_os = "freebsd", + target_os = "dragonfly", + target_os = "openbsd"))] pub unsafe fn set_name(name: &str) { // pthread_set_name_np() since almost forever on all BSDs let cname = CString::from_slice(name.as_bytes()); @@ -314,7 +316,9 @@ extern { stacksize: *mut libc::size_t) -> libc::c_int; } -#[cfg(any(target_os = "freebsd", target_os = "dragonfly"))] +#[cfg(any(target_os = "freebsd", + target_os = "dragonfly", + target_os = "openbsd"))] extern { pub fn pthread_self() -> libc::pthread_t; fn pthread_set_name_np(tid: libc::pthread_t, name: *const libc::c_char); @@ -330,7 +334,6 @@ extern { #[cfg(target_os = "openbsd")] extern { - pub fn pthread_self() -> libc::pthread_t; pub fn pthread_stackseg_np(thread: libc::pthread_t, sinfo: *mut stack_t) -> libc::c_uint; pub fn pthread_main_np() -> libc::c_uint; |