rust_task.h - fix disallow_kill & don't inherit rust_cond

This commit is contained in:
Ben Blum 2012-07-10 16:56:00 -04:00
parent 424ae442c5
commit e8b13e8f26

@ -120,7 +120,7 @@ rust_task_fail(rust_task *task,
size_t line);
struct
rust_task : public kernel_owned<rust_task>, rust_cond
rust_task : public kernel_owned<rust_task>
{
RUST_ATOMIC_REFCOUNT();
@ -185,7 +185,7 @@ private:
bool killed;
// Indicates that we've called back into Rust from C
bool reentered_rust_stack;
int disallow_kill;
unsigned long disallow_kill;
// The stack used for running C code, borrowed from the scheduler thread
stk_seg *c_stack;