about summary refs log tree commit diff
path: root/src/rt/rust_builtin.cpp
diff options
context:
space:
mode:
authorEric Holk <eric.holk@gmail.com>2012-07-10 10:58:44 -0700
committerEric Holk <eric.holk@gmail.com>2012-07-10 22:00:47 -0700
commit26e6eb3d14d7ff3bcbfa5ca442a6928776982e98 (patch)
tree81a017f6b8e77536ec47fb0b9045c34979edeec9 /src/rt/rust_builtin.cpp
parentd07e537fc3daaf73b7baf652e13ee2d36706258e (diff)
downloadrust-26e6eb3d14d7ff3bcbfa5ca442a6928776982e98.tar.gz
rust-26e6eb3d14d7ff3bcbfa5ca442a6928776982e98.zip
Handle failure conditions correctly in pipes.
Diffstat (limited to 'src/rt/rust_builtin.cpp')
-rw-r--r--src/rt/rust_builtin.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp
index 732dbaa3293..aa314d2811e 100644
--- a/src/rt/rust_builtin.cpp
+++ b/src/rt/rust_builtin.cpp
@@ -930,11 +930,11 @@ task_clear_event_reject(rust_task *task) {
 // Waits on an event, returning the pointer to the event that unblocked this
 // task.
 extern "C" void *
-task_wait_event(rust_task *task) {
+task_wait_event(rust_task *task, bool *killed) {
     // TODO: we should assert that the passed in task is the currently running
     // task. We wouldn't want to wait some other task.
 
-    return task->wait_event();
+    return task->wait_event(killed);
 }
 
 extern "C" void