diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2013-08-21 09:31:02 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2013-08-21 10:50:42 -0400 |
| commit | ffb6404c5ade3af113738c3cb72fd853e82a379e (patch) | |
| tree | 1d23b3e18b9b6da03291111a039cf3e9aca7f717 /src/libstd/rt/task.rs | |
| parent | 82a9abbf624daaaca0c9761ee1bea6097472975c (diff) | |
| download | rust-ffb6404c5ade3af113738c3cb72fd853e82a379e.tar.gz rust-ffb6404c5ade3af113738c3cb72fd853e82a379e.zip | |
Adjust callbacks in the libraries for the new type of extern fns
cc #3678
Diffstat (limited to 'src/libstd/rt/task.rs')
| -rw-r--r-- | src/libstd/rt/task.rs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/libstd/rt/task.rs b/src/libstd/rt/task.rs index 3b8eb87f8af..12ba39a6dcd 100644 --- a/src/libstd/rt/task.rs +++ b/src/libstd/rt/task.rs @@ -445,8 +445,17 @@ impl Unwinder { } extern { + #[cfg(not(stage0))] #[rust_stack] - fn rust_try(f: *u8, code: *c_void, data: *c_void) -> uintptr_t; + fn rust_try(f: extern "C" fn(*c_void, *c_void), + code: *c_void, + data: *c_void) -> uintptr_t; + + #[cfg(stage0)] + #[rust_stack] + fn rust_try(f: *u8, + code: *c_void, + data: *c_void) -> uintptr_t; } } |