Skip to content

Commit bbc066a

Browse files
committed
---
yaml --- r: 178137 b: refs/heads/tmp c: f6414b0 h: refs/heads/master i: 178135: ac44ca3 v: v3
1 parent c50b857 commit bbc066a

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
3434
refs/heads/beta: 44a287e6eb22ec3c2a687fc156813577464017f7
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
37-
refs/heads/tmp: fdb5d77d0921f70d4c7b6b1ace15b5d481a6b732
37+
refs/heads/tmp: f6414b0187bfc6e5b563a17c85a9f790d6257551

branches/tmp/src/libstd/sys/unix/thread.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,9 @@ pub unsafe fn set_name(name: &str) {
248248
}
249249
}
250250

251-
#[cfg(any(target_os = "freebsd", target_os = "dragonfly"))]
251+
#[cfg(any(target_os = "freebsd",
252+
target_os = "dragonfly",
253+
target_os = "openbsd"))]
252254
pub unsafe fn set_name(name: &str) {
253255
// pthread_set_name_np() since almost forever on all BSDs
254256
let cname = CString::from_slice(name.as_bytes());
@@ -314,7 +316,9 @@ extern {
314316
stacksize: *mut libc::size_t) -> libc::c_int;
315317
}
316318

317-
#[cfg(any(target_os = "freebsd", target_os = "dragonfly"))]
319+
#[cfg(any(target_os = "freebsd",
320+
target_os = "dragonfly",
321+
target_os = "openbsd"))]
318322
extern {
319323
pub fn pthread_self() -> libc::pthread_t;
320324
fn pthread_set_name_np(tid: libc::pthread_t, name: *const libc::c_char);
@@ -330,7 +334,6 @@ extern {
330334

331335
#[cfg(target_os = "openbsd")]
332336
extern {
333-
pub fn pthread_self() -> libc::pthread_t;
334337
pub fn pthread_stackseg_np(thread: libc::pthread_t,
335338
sinfo: *mut stack_t) -> libc::c_uint;
336339
pub fn pthread_main_np() -> libc::c_uint;

0 commit comments

Comments
 (0)