mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-28 01:41:25 +02:00
9943b09490
musl has padding fields in struct msghdr for posix compliance. use designated initializer to get rid of the warnings.
31 lines
892 B
Diff
31 lines
892 B
Diff
--- bird-1.6.0.orig/sysdep/linux/netlink.c
|
|
+++ bird-1.6.0/sysdep/linux/netlink.c
|
|
@@ -125,7 +125,12 @@
|
|
{
|
|
struct iovec iov = { nl->rx_buffer, NL_RX_SIZE };
|
|
struct sockaddr_nl sa;
|
|
- struct msghdr m = { (struct sockaddr *) &sa, sizeof(sa), &iov, 1, NULL, 0, 0 };
|
|
+ struct msghdr m = {
|
|
+ .msg_name = (struct sockaddr *) &sa,
|
|
+ .msg_namelen = sizeof(sa),
|
|
+ .msg_iov = &iov,
|
|
+ .msg_iovlen = 1,
|
|
+ };
|
|
int x = recvmsg(nl->fd, &m, 0);
|
|
if (x < 0)
|
|
die("nl_get_reply: %m");
|
|
@@ -1231,7 +1236,12 @@
|
|
{
|
|
struct iovec iov = { nl_async_rx_buffer, NL_RX_SIZE };
|
|
struct sockaddr_nl sa;
|
|
- struct msghdr m = { (struct sockaddr *) &sa, sizeof(sa), &iov, 1, NULL, 0, 0 };
|
|
+ struct msghdr m = {
|
|
+ .msg_name = (struct sockaddr *) &sa,
|
|
+ .msg_namelen = sizeof(sa),
|
|
+ .msg_iov = &iov,
|
|
+ .msg_iovlen = 1,
|
|
+ };
|
|
struct nlmsghdr *h;
|
|
int x;
|
|
uint len;
|