File 0025-fix-compile-error-on-musl.patch of Package systemd-mini

Overview Repositories Revisions Requests Users Attributes Meta

File 0025-fix-compile-error-on-musl.patch of Package systemd-mini (Revision ead732ed5be8558edbcfa03c2ce20d44)

Currently displaying revision ead732ed5be8558edbcfa03c2ce20d44 , Show latest

From 12c81febfafc5c5172b30ce30ca369d236de57ba Mon Sep 17 00:00:00 2001
From: Matija Skala <mskala@gmx.com>
Date: Mon, 30 Oct 2017 10:15:31 +0100
Subject: [PATCH 25/51] fix compile error on musl

name '__in6_u.__u6_addr32' is specific to glibc

use 's6_addr32' macro instead

(cherry picked from commit 5a10b4d6bf209aa95f5a675130da184343aa5fb3)
---
 src/core/ip-address-access.c | 4 ++--
 src/shared/bus-unit-util.c   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core/ip-address-access.c b/src/core/ip-address-access.c
index cfb7d51c4f..3012de4bc7 100644
--- a/src/core/ip-address-access.c
+++ b/src/core/ip-address-access.c
@@ -114,7 +114,7 @@ int config_parse_ip_address_access(
 
                         a->family = AF_INET6;
                         a->address.in6 = (struct in6_addr) {
-                                .__in6_u.__u6_addr32[0] = htobe32(0xfe800000)
+                                .s6_addr32[0] = htobe32(0xfe800000)
                         };
                         a->prefixlen = 64;
 
@@ -133,7 +133,7 @@ int config_parse_ip_address_access(
 
                         a->family = AF_INET6;
                         a->address.in6 = (struct in6_addr) {
-                                .__in6_u.__u6_addr32[0] = htobe32(0xff000000)
+                                .s6_addr32[0] = htobe32(0xff000000)
                         };
                         a->prefixlen = 8;
 
diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c
index 415434fbd2..7117c5dacc 100644
--- a/src/shared/bus-unit-util.c
+++ b/src/shared/bus-unit-util.c
@@ -460,7 +460,7 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
                                         return bus_log_create_error(r);
 
                                 prefix.in6 = (struct in6_addr) {
-                                        .__in6_u.__u6_addr32[0] = htobe32(0xfe800000)
+                                        .s6_addr32[0] = htobe32(0xfe800000)
                                 };
                                 r = bus_append_ip_address_access(m, AF_INET6, &prefix, 64);
                                 if (r < 0)
@@ -476,7 +476,7 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
                                         return bus_log_create_error(r);
 
                                 prefix.in6 = (struct in6_addr) {
-                                        .__in6_u.__u6_addr32[0] = htobe32(0xff000000)
+                                        .s6_addr32[0] = htobe32(0xff000000)
                                 };
                                 r = bus_append_ip_address_access(m, AF_INET6, &prefix, 8);
                                 if (r < 0)
-- 
2.16.4

Places

File 0025-fix-compile-error-on-musl.patch of Package systemd-mini (Revision ead732ed5be8558edbcfa03c2ce20d44)

Places