From b6ba69febbb5b7de5a63a9bced344f73be3c7947 Mon Sep 17 00:00:00 2001 From: auronandace Date: Sun, 10 May 2026 08:33:38 +0100 Subject: [PATCH] remove struct export workaround from sys_socket --- src/header/sys_socket/cbindgen.toml | 7 +++++++ src/header/sys_socket/mod.rs | 11 ++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/header/sys_socket/cbindgen.toml b/src/header/sys_socket/cbindgen.toml index 6372c60a0f..4bf07a96f6 100644 --- a/src/header/sys_socket/cbindgen.toml +++ b/src/header/sys_socket/cbindgen.toml @@ -41,5 +41,12 @@ cpp_compat = true [enum] prefix_with_name = true +[export] +include = [ + "linger", + "cmsghdr", + "ucred" +] + [export.rename] "iovec" = "struct iovec" diff --git a/src/header/sys_socket/mod.rs b/src/header/sys_socket/mod.rs index f293bd7c58..1cc72a6025 100644 --- a/src/header/sys_socket/mod.rs +++ b/src/header/sys_socket/mod.rs @@ -27,9 +27,6 @@ pub struct linger { pub l_linger: c_int, } -#[unsafe(no_mangle)] -pub extern "C" fn _cbindgen_export_linger(linger: linger) {} - /// See . #[repr(C)] #[derive(Debug, CheckVsLibcCrate)] @@ -52,6 +49,8 @@ pub struct cmsghdr { pub cmsg_type: c_int, } +// TODO: `ucred` should be behind _GNU_SOURCE include guard +/// Non-POSIX, see . #[repr(C)] #[derive(Clone, Debug)] // FIXME: CheckVsLibcCrate @@ -61,12 +60,6 @@ pub struct ucred { pub gid: gid_t, } -#[unsafe(no_mangle)] -pub extern "C" fn _cbindgen_export_cmsghdr(cmsghdr: cmsghdr) {} - -#[unsafe(no_mangle)] -pub extern "C" fn _cbindgen_export_ucred(ucred: ucred) {} - /// See . #[repr(C)] #[derive(Default, CheckVsLibcCrate)]