about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2013-12-29 15:23:15 -0800
committerAlex Crichton <alex@alexcrichton.com>2013-12-29 15:23:15 -0800
commit0da86ba48bb6c23f23d576b4224dba501f0b5eca (patch)
tree19a0f7f8fa3610ccc24f4c360a8e3c29867383c1 /src/libstd
parentaa5d779a3590b1ed1559e0489138040a71ae688b (diff)
downloadrust-0da86ba48bb6c23f23d576b4224dba501f0b5eca.tar.gz
rust-0da86ba48bb6c23f23d576b4224dba501f0b5eca.zip
Actually block in a windows cvar
Turns out with an argument of 0 the function always returns immediately!

Closes #11003
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/comm/mod.rs3
-rw-r--r--src/libstd/unstable/mutex.rs2
2 files changed, 1 insertions, 4 deletions
diff --git a/src/libstd/comm/mod.rs b/src/libstd/comm/mod.rs
index 6281f6d53ab..b21b255dbfc 100644
--- 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
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);
     }