From 3aca523c3751d5ba00abae0d20ea8d9bbf38ff85 Mon Sep 17 00:00:00 2001 From: Kevin Staunton-Lambert Date: Sun, 23 Mar 2025 10:00:01 +1100 Subject: [PATCH] #4461 fix up extern C ABI warnings --- src/closure.rs | 4 ++-- src/lib.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/closure.rs b/src/closure.rs index d5107c34ec9..c9ad5a5aabc 100644 --- a/src/closure.rs +++ b/src/closure.rs @@ -599,7 +599,7 @@ macro_rules! doit { inform(invoke::<$($var,)* R> as usize as u32); - unsafe extern fn destroy<$($var: FromWasmAbi,)* R: ReturnWasmAbi>( + unsafe extern "C" fn destroy<$($var: FromWasmAbi,)* R: ReturnWasmAbi>( a: usize, b: usize, ) { @@ -660,7 +660,7 @@ macro_rules! doit { inform(invoke::<$($var,)* R> as usize as u32); - unsafe extern fn destroy<$($var: FromWasmAbi,)* R: ReturnWasmAbi>( + unsafe extern "C" fn destroy<$($var: FromWasmAbi,)* R: ReturnWasmAbi>( a: usize, b: usize, ) { diff --git a/src/lib.rs b/src/lib.rs index 0c81941bc39..007362c5b5b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -84,7 +84,7 @@ macro_rules! externs { $( #[cfg(not(all(target_arch = "wasm32", any(target_os = "unknown", target_os = "none"))))] #[allow(unused_variables)] - unsafe extern fn $name($($args)*) -> $ret { + unsafe extern "C" fn $name($($args)*) -> $ret { panic!("function not implemented on non-wasm32 targets") } )*