66 lines
2.6 KiB
Diff
66 lines
2.6 KiB
Diff
|
From 7b8400f902ef25ea71ed460716c1afedca357a61 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Natanael Copa <ncopa@alpinelinux.org>
|
||
|
|
Date: Wed, 2 Nov 2022 12:31:36 +0100
|
||
|
|
Subject: [PATCH] libphobos: fix undefined reference to `__cmsg_nxthdr' with
|
||
|
|
musl
|
||
|
|
|
||
|
|
Ported fix from upstream.
|
||
|
|
|
||
|
|
Upstream: https://github.com/dlang/dmd/commit/54544260a848c8ebad5582e27ac1e09627cdfb17
|
||
|
|
Bug-URL: https://issues.dlang.org/show_bug.cgi?id=23157
|
||
|
|
---
|
||
|
|
.../libdruntime/core/sys/posix/sys/socket.d | 36 +++++++++++++++++--
|
||
|
|
1 file changed, 33 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/libphobos/libdruntime/core/sys/posix/sys/socket.d b/libphobos/libdruntime/core/sys/posix/sys/socket.d
|
||
|
|
index c1309a68c9c..e3b536d87e7 100644
|
||
|
|
--- a/libphobos/libdruntime/core/sys/posix/sys/socket.d
|
||
|
|
+++ b/libphobos/libdruntime/core/sys/posix/sys/socket.d
|
||
|
|
@@ -188,10 +188,40 @@ version (linux)
|
||
|
|
|
||
|
|
extern (D) inout(ubyte)* CMSG_DATA( return scope inout(cmsghdr)* cmsg ) pure nothrow @nogc { return cast(ubyte*)( cmsg + 1 ); }
|
||
|
|
|
||
|
|
- private inout(cmsghdr)* __cmsg_nxthdr(inout(msghdr)*, inout(cmsghdr)*) pure nothrow @nogc;
|
||
|
|
- extern (D) inout(cmsghdr)* CMSG_NXTHDR(inout(msghdr)* msg, inout(cmsghdr)* cmsg) pure nothrow @nogc
|
||
|
|
+ version (CRuntime_Musl)
|
||
|
|
{
|
||
|
|
- return __cmsg_nxthdr(msg, cmsg);
|
||
|
|
+ extern (D)
|
||
|
|
+ {
|
||
|
|
+ private size_t __CMSG_LEN(inout(cmsghdr)* cmsg) pure nothrow @nogc
|
||
|
|
+ {
|
||
|
|
+ return (cmsg.cmsg_len + size_t.sizeof -1) & cast(size_t)(~(size_t.sizeof - 1));
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ private inout(cmsghdr)* __CMSG_NEXT(inout(cmsghdr)* cmsg) pure nothrow @nogc
|
||
|
|
+ {
|
||
|
|
+ return cmsg + __CMSG_LEN(cmsg);
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ private inout(msghdr)* __MHDR_END(inout(msghdr)* mhdr) pure nothrow @nogc
|
||
|
|
+ {
|
||
|
|
+ return cast(inout(msghdr)*)(mhdr.msg_control + mhdr.msg_controllen);
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ inout(cmsghdr)* CMSG_NXTHDR(inout(msghdr)* msg, inout(cmsghdr)* cmsg) pure nothrow @nogc
|
||
|
|
+ {
|
||
|
|
+ return cmsg.cmsg_len < cmsghdr.sizeof ||
|
||
|
|
+ __CMSG_LEN(cmsg) + cmsghdr.sizeof >= __MHDR_END(msg) - cast(inout(msghdr)*)(cmsg)
|
||
|
|
+ ? cast(inout(cmsghdr)*) null : cast(inout(cmsghdr)*) __CMSG_NEXT(cmsg);
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+ else
|
||
|
|
+ {
|
||
|
|
+ private inout(cmsghdr)* __cmsg_nxthdr(inout(msghdr)*, inout(cmsghdr)*) pure nothrow @nogc;
|
||
|
|
+ extern (D) inout(cmsghdr)* CMSG_NXTHDR(inout(msghdr)* msg, inout(cmsghdr)* cmsg) pure nothrow @nogc
|
||
|
|
+ {
|
||
|
|
+ return __cmsg_nxthdr(msg, cmsg);
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
extern (D) inout(cmsghdr)* CMSG_FIRSTHDR( inout(msghdr)* mhdr ) pure nothrow @nogc
|
||
|
|
--
|
||
|
|
2.38.1
|
||
|
|
|