Skip to content

Commit d617e6b

Browse files
committed
use #[thread_local] on windows
1 parent ecc774f commit d617e6b

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

src/libstd/rt/local_ptr.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@ use cast;
2121
use ops::Drop;
2222
use ptr::RawPtr;
2323

24-
#[cfg(windows)] // mingw-w32 doesn't like thread_local things
2524
#[cfg(target_os = "android")] // see #10686
2625
pub use self::native::*;
2726

28-
#[cfg(not(windows), not(target_os = "android"))]
27+
#[cfg(not(target_os = "android"))]
2928
pub use self::compiled::*;
3029

3130
/// Encapsulates a borrowed value. When this value goes out of scope, the
@@ -76,7 +75,7 @@ pub unsafe fn borrow<T>() -> Borrowed<T> {
7675
/// implemented using LLVM's thread_local attribute which isn't necessarily
7776
/// working on all platforms. This implementation is faster, however, so we use
7877
/// it wherever possible.
79-
#[cfg(not(windows), not(target_os = "android"))]
78+
#[cfg(not(target_os = "android"))]
8079
pub mod compiled {
8180
use cast;
8281
use option::{Option, Some, None};

0 commit comments

Comments
 (0)