diff options
| author | Brian Anderson <andersrb@gmail.com> | 2011-03-07 21:21:01 -0500 |
|---|---|---|
| committer | Brian Anderson <andersrb@gmail.com> | 2011-03-07 21:21:01 -0500 |
| commit | 9fc4db6b89213afdf45c02fc2bd2be62b0ddc40c (patch) | |
| tree | 6c84574116273f91cbe89abd256b9f809adf97de /src/rt/rust_task.h | |
| parent | 3fedb18c0af0bd9fa5e4973936003c0b57e4d3e8 (diff) | |
| parent | 6ed226c6b3a28f3c10d2176d7dba7e339bf0ab99 (diff) | |
| download | rust-9fc4db6b89213afdf45c02fc2bd2be62b0ddc40c.tar.gz rust-9fc4db6b89213afdf45c02fc2bd2be62b0ddc40c.zip | |
Merge branch 'master' into recursive-elseif
Conflicts: src/Makefile src/comp/front/ast.rs src/comp/front/parser.rs src/comp/middle/fold.rs src/comp/middle/trans.rs
Diffstat (limited to 'src/rt/rust_task.h')
| -rw-r--r-- | src/rt/rust_task.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/rt/rust_task.h b/src/rt/rust_task.h index 9fbc67acff5..5318ab71edf 100644 --- a/src/rt/rust_task.h +++ b/src/rt/rust_task.h @@ -56,6 +56,7 @@ rust_task : public maybe_proxy<rust_task>, ~rust_task(); void start(uintptr_t exit_task_glue, + uintptr_t spawnee_abi, uintptr_t spawnee_fn, uintptr_t args, size_t callsz); |