Skip to content

Commit 2960ebc

Browse files
committed
---
yaml --- r: 7128 b: refs/heads/master c: 26536e6 h: refs/heads/master v: v3
1 parent fc86010 commit 2960ebc

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 972f6c17fb007d7c1508e1e8f03c35385f1b841c
2+
refs/heads/master: 26536e69151d5f8e083d8165421039b409c93ee3

trunk/src/rt/rust_unwind.h

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
#ifdef __APPLE__
77
#include <libunwind.h>
88

9-
typedef int _Unwind_Action;
109
typedef void _Unwind_Context;
11-
typedef void _Unwind_Exception;
1210
typedef int _Unwind_Reason_Code;
1311

1412
#else
@@ -17,5 +15,12 @@ typedef int _Unwind_Reason_Code;
1715

1816
#endif
1917

18+
#if (defined __APPLE__) || (defined __clang__)
19+
20+
typedef int _Unwind_Action;
21+
typedef void _Unwind_Exception;
22+
23+
#endif
24+
2025
#endif
2126

0 commit comments

Comments
 (0)