diff options
| author | bors <bors@rust-lang.org> | 2013-04-28 15:36:35 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-04-28 15:36:35 -0700 |
| commit | 9f03d45c56b37b36912c16bd5b4fb4723fd91cb7 (patch) | |
| tree | 9f7aa02b6da40b39c78d11a7a966bc92fd81f439 /src/rt/rust_upcall.cpp | |
| parent | 1f9823375b2ed303e85b56db839283db79905ba4 (diff) | |
| parent | 507c200da17cde760f359da4be1fa13e723cab19 (diff) | |
| download | rust-9f03d45c56b37b36912c16bd5b4fb4723fd91cb7.tar.gz rust-9f03d45c56b37b36912c16bd5b4fb4723fd91cb7.zip | |
auto merge of #5646 : Aatch/rust/unwind-fix, r=brson
This fixes issue #5641
Diffstat (limited to 'src/rt/rust_upcall.cpp')
| -rw-r--r-- | src/rt/rust_upcall.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp index e524e6de859..59f06feee4b 100644 --- a/src/rt/rust_upcall.cpp +++ b/src/rt/rust_upcall.cpp @@ -19,10 +19,16 @@ #include "rust_globals.h" #include "rust_task.h" #include "rust_sched_loop.h" -#include "rust_unwind.h" #include "rust_upcall.h" #include "rust_util.h" +//Unwinding ABI declarations. +typedef int _Unwind_Reason_Code; +typedef int _Unwind_Action; + +struct _Unwind_Context; +struct _Unwind_Exception; + #ifdef __GNUC__ #define LOG_UPCALL_ENTRY(task) \ LOG(task, upcall, \ |