diff --git a/crates/libs/link/src/lib.rs b/crates/libs/link/src/lib.rs index 0d0f83103f..feee0da270 100644 --- a/crates/libs/link/src/lib.rs +++ b/crates/libs/link/src/lib.rs @@ -32,7 +32,7 @@ macro_rules! link { #[macro_export] macro_rules! link { ($library:literal $abi:literal $($link_name:literal)? fn $($function:tt)*) => ( - extern "C" { + extern $abi { pub fn $($function)*; } ) diff --git a/crates/libs/targets/src/lib.rs b/crates/libs/targets/src/lib.rs index e43baf582b..b1ddc313c5 100644 --- a/crates/libs/targets/src/lib.rs +++ b/crates/libs/targets/src/lib.rs @@ -28,7 +28,7 @@ macro_rules! link { } /// Defines an external function to import. -#[cfg(all(windows, not(windows_raw_dylib), target_arch = "x86"))] +#[cfg(all(windows, not(windows_raw_dylib)))] #[macro_export] macro_rules! link { ($library:literal $abi:literal $($link_name:literal)? fn $($function:tt)*) => ( @@ -40,25 +40,12 @@ macro_rules! link { ) } -/// Defines an external function to import. -#[cfg(all(windows, not(windows_raw_dylib), not(target_arch = "x86")))] -#[macro_export] -macro_rules! link { - ($library:literal $abi:literal $($link_name:literal)? fn $($function:tt)*) => ( - #[link(name = "windows.0.53.0")] - extern "C" { - $(#[link_name=$link_name])? - pub fn $($function)*; - } - ) -} - /// Defines an external function to import. #[cfg(all(not(windows), not(windows_raw_dylib)))] #[macro_export] macro_rules! link { ($library:literal $abi:literal $($link_name:literal)? fn $($function:tt)*) => ( - extern "C" { + extern $abi { pub fn $($function)*; } )