From d617e6b64558559d841a2ef94b4fb01e00986b13 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Fri, 11 Apr 2014 21:46:27 -0400 Subject: [PATCH] use #[thread_local] on windows --- src/libstd/rt/local_ptr.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/libstd/rt/local_ptr.rs b/src/libstd/rt/local_ptr.rs index e3f64f40c0d40..5643ff55e7055 100644 --- a/src/libstd/rt/local_ptr.rs +++ b/src/libstd/rt/local_ptr.rs @@ -21,11 +21,10 @@ use cast; use ops::Drop; use ptr::RawPtr; -#[cfg(windows)] // mingw-w32 doesn't like thread_local things #[cfg(target_os = "android")] // see #10686 pub use self::native::*; -#[cfg(not(windows), not(target_os = "android"))] +#[cfg(not(target_os = "android"))] pub use self::compiled::*; /// Encapsulates a borrowed value. When this value goes out of scope, the @@ -76,7 +75,7 @@ pub unsafe fn borrow() -> Borrowed { /// implemented using LLVM's thread_local attribute which isn't necessarily /// working on all platforms. This implementation is faster, however, so we use /// it wherever possible. -#[cfg(not(windows), not(target_os = "android"))] +#[cfg(not(target_os = "android"))] pub mod compiled { use cast; use option::{Option, Some, None};