Move over relevant changes from main

wasix-org · Aug 29, 2024 · 7a75fd9 · 7a75fd9
1 parent 6ed8750
commit 7a75fd9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git 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
@@ -960,7 +960,6 @@ extern "C" {
         old: *mut sigaction,
         _external_handler: ::Option<unsafe extern "C" fn(::c_int)>,
     ) -> ::c_int;
-    fn __wasm_signal(signum: ::c_int);
 }
 
 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) {
     }
 }
 
-mod wasm_signal {
-    #[no_mangle]
-    extern "C" fn __wasm_signal(signum: ::c_int) {
-        unsafe { super::__wasm_signal(signum) };
-    }
-}
-
 /// mocked functions that dont do anything in WASI land
 pub fn mlock(_addr: *const ::c_void, _len: ::size_t) -> ::c_int {
     0
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		pub type sigset_t = c_uchar;
		pub type sigset_t = ::c_uchar;