diff options
| author | bors <bors@rust-lang.org> | 2015-03-18 05:55:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-03-18 05:55:19 +0000 |
| commit | f9a7bc58f89b9b15eb1269f0c0d68baf5fc7e966 (patch) | |
| tree | 7386a64c0514658269710fc8bf30a08d3251f03e /src/libstd | |
| parent | c10918905fda1344e78bc16e6e73294d096ee97d (diff) | |
| parent | 46aa621452b591e5c504fd85dfe514b92c49c228 (diff) | |
| download | rust-f9a7bc58f89b9b15eb1269f0c0d68baf5fc7e966.tar.gz rust-f9a7bc58f89b9b15eb1269f0c0d68baf5fc7e966.zip | |
Auto merge of #23290 - nrc:pub_priv_mod, r=nikomatsakis
Closes #22261 r? @nikomatsakis (+ a new test coming soon...)
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sys/unix/stack_overflow.rs | 6 | ||||
| -rw-r--r-- | src/libstd/sys/windows/backtrace.rs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/sys/unix/stack_overflow.rs b/src/libstd/sys/unix/stack_overflow.rs index 1f212ea5a61..35706682047 100644 --- a/src/libstd/sys/unix/stack_overflow.rs +++ b/src/libstd/sys/unix/stack_overflow.rs @@ -144,7 +144,7 @@ mod imp { munmap(handler._data, SIGSTKSZ); } - type sighandler_t = *mut libc::c_void; + pub type sighandler_t = *mut libc::c_void; #[cfg(any(all(target_os = "linux", target_arch = "x86"), // may not match all(target_os = "linux", target_arch = "x86_64"), @@ -156,7 +156,7 @@ mod imp { target_os = "android"))] // may not match mod signal { use libc; - use super::sighandler_t; + pub use super::sighandler_t; pub static SA_ONSTACK: libc::c_int = 0x08000000; pub static SA_SIGINFO: libc::c_int = 0x00000004; @@ -210,7 +210,7 @@ mod imp { target_os = "openbsd"))] mod signal { use libc; - use super::sighandler_t; + pub use super::sighandler_t; pub const SA_ONSTACK: libc::c_int = 0x0001; pub const SA_SIGINFO: libc::c_int = 0x0040; diff --git a/src/libstd/sys/windows/backtrace.rs b/src/libstd/sys/windows/backtrace.rs index 8638099ca69..8935f97ce5d 100644 --- a/src/libstd/sys/windows/backtrace.rs +++ b/src/libstd/sys/windows/backtrace.rs @@ -104,7 +104,7 @@ struct ADDRESS64 { Mode: ADDRESS_MODE, } -struct STACKFRAME64 { +pub struct STACKFRAME64 { AddrPC: ADDRESS64, AddrReturn: ADDRESS64, AddrFrame: ADDRESS64, |