diff options
| author | bors <bors@rust-lang.org> | 2014-08-15 00:46:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-08-15 00:46:19 +0000 |
| commit | 6b5ec40d452d910148de7c87121acbbe1be8851a (patch) | |
| tree | a82605896ad61ef0337221819005e9d19c16c902 /src/libnative | |
| parent | dbb0cee682cdff796561cd6cca9bb6925a7b1ca2 (diff) | |
| parent | 88c27e099f94b26d19f9e266e728269d6a23c811 (diff) | |
| download | rust-6b5ec40d452d910148de7c87121acbbe1be8851a.tar.gz rust-6b5ec40d452d910148de7c87121acbbe1be8851a.zip | |
auto merge of #16435 : vadimcn/rust/windows, r=pcwalton
Using "win32" to mean "Windows" is confusing, especially now, that Rust supports win64 builds. Let's call spade a spade.
Diffstat (limited to 'src/libnative')
| -rw-r--r-- | src/libnative/io/mod.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libnative/io/mod.rs b/src/libnative/io/mod.rs index db5421481ee..afd818bd7d7 100644 --- a/src/libnative/io/mod.rs +++ b/src/libnative/io/mod.rs @@ -58,7 +58,8 @@ pub mod file; #[path = "timer_unix.rs"] pub mod timer; -#[cfg(target_os = "win32")] +#[cfg(target_os = "windows")] +#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot #[path = "timer_win32.rs"] pub mod timer; |