diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-03-19 06:09:25 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-03-19 08:49:35 +0530 |
| commit | acc706db4bea7fe8b0cede5ba3f45ad3fff47ce9 (patch) | |
| tree | 766c62801c86449e0bcfe97b7d1a31dce714f0cb /src/libstd/sys | |
| parent | b06c9a01c1fd8e30f206f09372c3cf4b4cc5ed7a (diff) | |
| parent | 95a1e98fce4ea06f8a6de001dfdac28c268f9c29 (diff) | |
| download | rust-acc706db4bea7fe8b0cede5ba3f45ad3fff47ce9.tar.gz rust-acc706db4bea7fe8b0cede5ba3f45ad3fff47ce9.zip | |
Rollup merge of #23483 - semarie:openbsd-threads, r=alexcrichton
unbreak openbsd/bitrig build - remove `pub` from `struct` (error: visibility has no effect inside functions) - move `pthread_main_np` into function r? @alexcrichton
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/unix/thread.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/libstd/sys/unix/thread.rs b/src/libstd/sys/unix/thread.rs index 04508294981..c5f07c6c75a 100644 --- a/src/libstd/sys/unix/thread.rs +++ b/src/libstd/sys/unix/thread.rs @@ -130,12 +130,13 @@ pub mod guard { #[cfg(any(target_os = "openbsd", target_os = "bitrig"))] pub unsafe fn current() -> usize { #[repr(C)] - pub struct stack_t { + struct stack_t { ss_sp: *mut libc::c_void, ss_size: libc::size_t, ss_flags: libc::c_int, } extern { + fn pthread_main_np() -> libc::c_uint; fn pthread_stackseg_np(thread: pthread_t, sinfo: *mut stack_t) -> libc::c_uint; } @@ -339,9 +340,6 @@ fn min_stack_size(_: *const libc::pthread_attr_t) -> libc::size_t { } extern { - #[cfg(any(target_os = "bitrig", target_os = "openbsd"))] - fn pthread_main_np() -> libc::c_uint; - fn pthread_self() -> libc::pthread_t; fn pthread_create(native: *mut libc::pthread_t, attr: *const libc::pthread_attr_t, |