diff options
| author | bors <bors@rust-lang.org> | 2015-03-27 23:11:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-03-27 23:11:21 +0000 |
| commit | 552080181c58beef03493a110b4a38b20b6b5da5 (patch) | |
| tree | 3dbfd8c87647f67e1d17c726e72b153609d7eea8 /src/libstd/sys/windows/thread.rs | |
| parent | 0c9de8140b8abdd2d0a83db93746c58e8bc0da2c (diff) | |
| parent | d3a4f362cba36a4bf0bb8f8a951ae9d6858ae73e (diff) | |
| download | rust-552080181c58beef03493a110b4a38b20b6b5da5.tar.gz rust-552080181c58beef03493a110b4a38b20b6b5da5.zip | |
Auto merge of #23796 - alexcrichton:rollup, r=alexcrichton
Diffstat (limited to 'src/libstd/sys/windows/thread.rs')
| -rw-r--r-- | src/libstd/sys/windows/thread.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sys/windows/thread.rs b/src/libstd/sys/windows/thread.rs index d1d4ad90081..98e4a737c7b 100644 --- a/src/libstd/sys/windows/thread.rs +++ b/src/libstd/sys/windows/thread.rs @@ -25,8 +25,8 @@ use time::Duration; pub type rust_thread = HANDLE; pub mod guard { - pub unsafe fn main() -> uint { 0 } - pub unsafe fn current() -> uint { 0 } + pub unsafe fn main() -> usize { 0 } + pub unsafe fn current() -> usize { 0 } pub unsafe fn init() {} } |