Skip to content

Commit 7a75fd9

Browse files
committed
Move over relevant changes from main
1 parent 6ed8750 commit 7a75fd9

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

src/wasi/wasi.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pub type sigset_t = c_uchar;
1+
pub type sigset_t = ::c_uchar;

src/wasi/wasix.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,6 @@ extern "C" {
960960
old: *mut sigaction,
961961
_external_handler: ::Option<unsafe extern "C" fn(::c_int)>,
962962
) -> ::c_int;
963-
fn __wasm_signal(signum: ::c_int);
964963
}
965964

966965
pub unsafe fn sigaction(sig: ::c_int, sa: *const sigaction, old: *mut sigaction) -> ::c_int {
@@ -975,13 +974,6 @@ extern "C" fn default_handler(sig: ::c_int) {
975974
}
976975
}
977976

978-
mod wasm_signal {
979-
#[no_mangle]
980-
extern "C" fn __wasm_signal(signum: ::c_int) {
981-
unsafe { super::__wasm_signal(signum) };
982-
}
983-
}
984-
985977
/// mocked functions that dont do anything in WASI land
986978
pub fn mlock(_addr: *const ::c_void, _len: ::size_t) -> ::c_int {
987979
0

0 commit comments

Comments
 (0)