Skip to content

Commit 4c4ac4f

Browse files
committed
---
yaml --- r: 186123 b: refs/heads/try c: f6414b0 h: refs/heads/master i: 186121: 17c3b37 186119: e818ad0 v: v3
1 parent 869582f commit 4c4ac4f

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
@@ -2,7 +2,7 @@
22
refs/heads/master: b4c965ee803a4521d8b4575f634e036f93e408f3
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 3a96d6a9818fe2affc98a187fb1065120458cee9
5-
refs/heads/try: fdb5d77d0921f70d4c7b6b1ace15b5d481a6b732
5+
refs/heads/try: f6414b0187bfc6e5b563a17c85a9f790d6257551
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/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)