Skip to content

Commit eab22a1

Browse files
committed
Match "cdecl" to "C"
1 parent 6a5c30a commit eab22a1

File tree

2 files changed

+21
-0
lines changed

2 files changed

+21
-0
lines changed

crates/libs/link/src/lib.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
#[cfg(all(windows, target_arch = "x86"))]
66
#[macro_export]
77
macro_rules! link {
8+
($library:literal "cdecl" $($link_name:literal)? fn $($function:tt)*) => (
9+
$crate::link!($library "C" $($link_name)? fn $($function)*);
10+
);
811
($library:literal $abi:literal $($link_name:literal)? fn $($function:tt)*) => (
912
#[link(name = $library, kind = "raw-dylib", modifiers = "+verbatim", import_name_type = "undecorated")]
1013
extern $abi {
@@ -18,6 +21,9 @@ macro_rules! link {
1821
#[cfg(all(windows, not(target_arch = "x86")))]
1922
#[macro_export]
2023
macro_rules! link {
24+
($library:literal "cdecl" $($link_name:literal)? fn $($function:tt)*) => (
25+
$crate::link!($library "C" $($link_name)? fn $($function)*);
26+
);
2127
($library:literal $abi:literal $($link_name:literal)? fn $($function:tt)*) => (
2228
#[link(name = $library, kind = "raw-dylib", modifiers = "+verbatim")]
2329
extern $abi {
@@ -31,6 +37,9 @@ macro_rules! link {
3137
#[cfg(not(windows))]
3238
#[macro_export]
3339
macro_rules! link {
40+
($library:literal "cdecl" $($link_name:literal)? fn $($function:tt)*) => (
41+
$crate::link!($library "C" $($link_name)? fn $($function)*);
42+
);
3443
($library:literal $abi:literal $($link_name:literal)? fn $($function:tt)*) => (
3544
extern $abi {
3645
pub fn $($function)*;

crates/libs/targets/src/lib.rs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
#[cfg(all(windows_raw_dylib, target_arch = "x86"))]
66
#[macro_export]
77
macro_rules! link {
8+
($library:literal "cdecl" $($link_name:literal)? fn $($function:tt)*) => (
9+
$crate::link!($library "C" $($link_name)? fn $($function)*);
10+
);
811
($library:literal $abi:literal $($link_name:literal)? fn $($function:tt)*) => (
912
#[link(name = $library, kind = "raw-dylib", modifiers = "+verbatim", import_name_type = "undecorated")]
1013
extern $abi {
@@ -18,6 +21,9 @@ macro_rules! link {
1821
#[cfg(all(windows_raw_dylib, not(target_arch = "x86")))]
1922
#[macro_export]
2023
macro_rules! link {
24+
($library:literal "cdecl" $($link_name:literal)? fn $($function:tt)*) => (
25+
$crate::link!($library "C" $($link_name)? fn $($function)*);
26+
);
2127
($library:literal $abi:literal $($link_name:literal)? fn $($function:tt)*) => (
2228
#[link(name = $library, kind = "raw-dylib", modifiers = "+verbatim")]
2329
extern $abi {
@@ -31,6 +37,9 @@ macro_rules! link {
3137
#[cfg(all(windows, not(windows_raw_dylib)))]
3238
#[macro_export]
3339
macro_rules! link {
40+
($library:literal "cdecl" $($link_name:literal)? fn $($function:tt)*) => (
41+
$crate::link!($library "C" $($link_name)? fn $($function)*);
42+
);
3443
($library:literal $abi:literal $($link_name:literal)? fn $($function:tt)*) => (
3544
#[link(name = "windows.0.53.0")]
3645
extern $abi {
@@ -44,6 +53,9 @@ macro_rules! link {
4453
#[cfg(all(not(windows), not(windows_raw_dylib)))]
4554
#[macro_export]
4655
macro_rules! link {
56+
($library:literal "cdecl" $($link_name:literal)? fn $($function:tt)*) => (
57+
$crate::link!($library "C" $($link_name)? fn $($function)*);
58+
);
4759
($library:literal $abi:literal $($link_name:literal)? fn $($function:tt)*) => (
4860
extern $abi {
4961
pub fn $($function)*;

0 commit comments

Comments
 (0)