about summary refs log tree commit diff
path: root/src/libstd/unstable
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-12-30 09:51:49 -0800
committerbors <bors@rust-lang.org>2013-12-30 09:51:49 -0800
commit1502b1197b78624aad5180fa8eff3f77f6f0abfc (patch)
treece469c00318299e149d641b33061e4641f12fcc3 /src/libstd/unstable
parentf7fd61876a3eab04e774dee695ef78fc0e5d0a0f (diff)
parent0da86ba48bb6c23f23d576b4224dba501f0b5eca (diff)
auto merge of #11199 : alexcrichton/rust/windows-isnt-waiting, r=pcwalton
Turns out with an argument of 0 the function always returns immediately!

Closes #11003
Diffstat (limited to 'src/libstd/unstable')
-rw-r--r--src/libstd/unstable/mutex.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/unstable/mutex.rs b/src/libstd/unstable/mutex.rs
index 5b2fac8e74e..7ab8a83d04b 100644
--- a/src/libstd/unstable/mutex.rs
+++ b/src/libstd/unstable/mutex.rs
@@ -286,7 +286,7 @@ mod imp {
 
     pub unsafe fn wait(cond: *c_void, m: *c_void) {
         unlock(m);
-        WaitForSingleObject(cond as HANDLE, 0);
+        WaitForSingleObject(cond as HANDLE, libc::INFINITE);
         lock(m);
     }