From e8b13e8f267a908285a2fb38c0661f54da2623e5 Mon Sep 17 00:00:00 2001
From: Ben Blum <bblum@andrew.cmu.edu>
Date: Tue, 10 Jul 2012 16:56:00 -0400
Subject: [PATCH] rust_task.h - fix disallow_kill & don't inherit rust_cond

---
 src/rt/rust_task.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/rt/rust_task.h b/src/rt/rust_task.h
index 6cb6dbaa653..74a8f65a23e 100644
--- a/src/rt/rust_task.h
+++ b/src/rt/rust_task.h
@@ -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;