about summary refs log tree commit diff
path: root/src/rt/rust_task.h
diff options
context:
space:
mode:
authorGraydon Hoare <graydon@mozilla.com>2011-12-07 11:52:38 -0800
committerGraydon Hoare <graydon@mozilla.com>2011-12-07 11:52:38 -0800
commita3f48d3fe1d90a4684cb20e75688ffbca804e82c (patch)
treef8ca510a3e827cb31e38cffdc260ab6112cf6b79 /src/rt/rust_task.h
parent1652b921fa2fadc936b346fc3de217cf97b0e476 (diff)
parent6c95e400d82699887b66f5de0fef2bb5e1f8cc32 (diff)
downloadrust-a3f48d3fe1d90a4684cb20e75688ffbca804e82c.tar.gz
rust-a3f48d3fe1d90a4684cb20e75688ffbca804e82c.zip
Merge branch 'master' of github.com:graydon/rust
Diffstat (limited to 'src/rt/rust_task.h')
-rw-r--r--src/rt/rust_task.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rt/rust_task.h b/src/rt/rust_task.h
index 00a9fc277dc..3d5cbff9910 100644
--- a/src/rt/rust_task.h
+++ b/src/rt/rust_task.h
@@ -25,7 +25,7 @@ struct rust_box;
 
 struct stk_seg {
     stk_seg *next;
-    uintptr_t limit;
+    uintptr_t end;
     unsigned int valgrind_id;
 #ifndef _LP64
     uint32_t pad;
@@ -200,6 +200,7 @@ rust_task : public kernel_owned<rust_task>, rust_cond
     void *new_stack(size_t stk_sz, void *args_addr, size_t args_sz);
     void del_stack();
     void record_stack_limit();
+    void reset_stack_limit();
 };
 
 //