---

yaml
---
r: 57871
b: refs/heads/incoming
c: 9f03d45
h: refs/heads/master
i:
  57869: bdace24
  57867: b83a0a7
  57863: f16853f
  57855: cfabe5b
v: v3

Author: bors

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: bf67eb2362b7d0f37012f2d6dac604c3bbacd2c6
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: 1f9823375b2ed303e85b56db839283db79905ba4
+refs/heads/incoming: 9f03d45c56b37b36912c16bd5b4fb4723fd91cb7
 refs/heads/dist-snap: 00dbbd01c2aee72982b3e0f9511ae1d4428c3ba9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/rt/rust_unwind.h

@@ -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,                                     \