diff options
| author | bors <bors@rust-lang.org> | 2013-11-26 13:32:43 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-11-26 13:32:43 -0800 |
| commit | 35ebf0348905a3a78025af4019e23ab97c86ec34 (patch) | |
| tree | 3a1a084d2e09d55ed9023320fd8d8b242a35a4d5 /src/libstd/rt/mod.rs | |
| parent | e9a1869a5f4164d5311963b1b25b05f003d43699 (diff) | |
| parent | a5af479bb479a2a4d3289f9feed9ac3ff299a395 (diff) | |
auto merge of #10312 : thestinger/rust/thread_local, r=alexcritchton
This provides a building block for fast thread-local storage. It does not change the safety semantics of `static mut`. Closes #10310
Diffstat (limited to 'src/libstd/rt/mod.rs')
| -rw-r--r-- | src/libstd/rt/mod.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libstd/rt/mod.rs b/src/libstd/rt/mod.rs index a8b510cbed7..860b65b20c6 100644 --- a/src/libstd/rt/mod.rs +++ b/src/libstd/rt/mod.rs @@ -95,7 +95,11 @@ pub use self::kill::BlockedTask; pub mod shouldnt_be_public { pub use super::select::SelectInner; pub use super::select::{SelectInner, SelectPortInner}; + #[cfg(stage0)] + #[cfg(windows)] pub use super::local_ptr::maybe_tls_key; + #[cfg(not(stage0), not(windows))] + pub use super::local_ptr::RT_TLS_PTR; } // Internal macros used by the runtime. |