diff options
| author | Kelvin Ly <kelvin.ly1618@gmail.com> | 2015-05-14 20:45:18 -0400 |
|---|---|---|
| committer | Kelvin Ly <kelvin.ly1618@gmail.com> | 2015-05-14 20:45:18 -0400 |
| commit | 507f8b8d942f17452c16876a02bef9e1bc15d028 (patch) | |
| tree | ec1924346cc4537d10a5b55eaca4f1620436f87e /src/libstd/sys/windows/thread.rs | |
| parent | 6e9e76ae5fe6a3104c265b43dcb5705b5ccd2743 (diff) | |
| parent | 571f371b3fce3e023fb1b41a1682de260c943222 (diff) | |
| download | rust-507f8b8d942f17452c16876a02bef9e1bc15d028.tar.gz rust-507f8b8d942f17452c16876a02bef9e1bc15d028.zip | |
Fix merge conflict and also add markdown formatting
Diffstat (limited to 'src/libstd/sys/windows/thread.rs')
| -rw-r--r-- | src/libstd/sys/windows/thread.rs | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/libstd/sys/windows/thread.rs b/src/libstd/sys/windows/thread.rs index 797f45f8702..50dfee4ab10 100644 --- a/src/libstd/sys/windows/thread.rs +++ b/src/libstd/sys/windows/thread.rs @@ -80,15 +80,7 @@ impl Thread { pub fn sleep(dur: Duration) { unsafe { - if dur < Duration::zero() { - return Thread::yield_now() - } - let ms = dur.num_milliseconds(); - // if we have a fractional number of milliseconds then add an extra - // millisecond to sleep for - let extra = dur - Duration::milliseconds(ms); - let ms = ms + if extra.is_zero() {0} else {1}; - c::Sleep(ms as DWORD); + c::Sleep(super::dur2timeout(dur)) } } } |