diff --git a/src/wasi/wasi.rs b/src/wasi/wasi.rs index 97c8313cee4e4..48805273dcf1b 100644 --- a/src/wasi/wasi.rs +++ b/src/wasi/wasi.rs @@ -1 +1 @@ -pub type sigset_t = c_uchar; +pub type sigset_t = ::c_uchar; diff --git a/src/wasi/wasix.rs b/src/wasi/wasix.rs index a21e4fb384592..a56402ff9c46f 100644 --- a/src/wasi/wasix.rs +++ b/src/wasi/wasix.rs @@ -960,7 +960,7 @@ extern "C" { old: *mut sigaction, _external_handler: ::Option, ) -> ::c_int; - fn __wasm_signal(signum: ::c_int); + fn __wasm_signal_impl(signum: ::c_int); } pub unsafe fn sigaction(sig: ::c_int, sa: *const sigaction, old: *mut sigaction) -> ::c_int { @@ -975,11 +975,11 @@ extern "C" fn default_handler(sig: ::c_int) { } } -mod wasm_signal { - #[no_mangle] - extern "C" fn __wasm_signal(signum: ::c_int) { - unsafe { super::__wasm_signal(signum) }; - } +// Export the __wasm_signal function, used for receiving +// signals from a WASIX runtime by wasix-libc +#[no_mangle] +extern "C" fn __wasm_signal(signum: ::c_int) { + unsafe { __wasm_signal_impl(signum) }; } /// mocked functions that dont do anything in WASI land