Skip to content

Commit 2445491

Browse files
committed
---
yaml --- r: 178066 b: refs/heads/auto c: f6414b0 h: refs/heads/master v: v3
1 parent 3c751b1 commit 2445491

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
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: fdb5d77d0921f70d4c7b6b1ace15b5d481a6b732
13+
refs/heads/auto: f6414b0187bfc6e5b563a17c85a9f790d6257551
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

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