diff options
| author | Ben Blum <bblum@andrew.cmu.edu> | 2012-07-05 19:55:01 -0400 |
|---|---|---|
| committer | Ben Blum <bblum@andrew.cmu.edu> | 2012-07-05 19:56:09 -0400 |
| commit | 7b3add0632f65865159af1ee35933c4e61d41f8b (patch) | |
| tree | 1688463a649a5c405e4579368b97287d5a2e21a1 /src/rt/rust_task.h | |
| parent | 7f56d740726d296b5658173a43c02a681879374a (diff) | |
| download | rust-7b3add0632f65865159af1ee35933c4e61d41f8b.tar.gz rust-7b3add0632f65865159af1ee35933c4e61d41f8b.zip | |
make disallow_kill an int for nested unkillables (closes #2782)
Diffstat (limited to 'src/rt/rust_task.h')
| -rw-r--r-- | src/rt/rust_task.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rt/rust_task.h b/src/rt/rust_task.h index f92682ec007..96b0bddd4e0 100644 --- a/src/rt/rust_task.h +++ b/src/rt/rust_task.h @@ -181,7 +181,7 @@ private: bool killed; // Indicates that we've called back into Rust from C bool reentered_rust_stack; - bool disallow_kill; + int disallow_kill; // The stack used for running C code, borrowed from the scheduler thread stk_seg *c_stack; |