auto merge of #11199 : alexcrichton/rust/windows-isnt-waiting, r=pcwa…

…lton Turns out with an argument of 0 the function always returns immediately! Closes #11003
rust-lang · Dec 30, 2013 · 1502b11 · 1502b11
2 parents f7fd618 + 0da86ba
commit 1502b11
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/src/libstd/comm/mod.rs b/src/libstd/comm/mod.rs
@@ -1019,7 +1019,6 @@ mod test {
     })
 
     #[test]
-    #[ignore(cfg(windows))] // FIXME(#11003)
     fn send_from_outside_runtime() {
         let (p, c) = Chan::<int>::new();
         let (p1, c1) = Chan::new();
@@ -1044,7 +1043,6 @@ mod test {
     }
 
     #[test]
-    #[ignore(cfg(windows))] // FIXME(#11003)
     fn recv_from_outside_runtime() {
         let (p, c) = Chan::<int>::new();
         let (dp, dc) = Chan::new();
@@ -1061,7 +1059,6 @@ mod test {
     }
 
     #[test]
-    #[ignore(cfg(windows))] // FIXME(#11003)
     fn no_runtime() {
         let (p1, c1) = Chan::<int>::new();
         let (p2, c2) = Chan::<int>::new();

diff --git 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);
     }