summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatija Skala <mskala@gmx.com>2017-10-30 10:15:31 +0100
committerMatija Skala <mskala@gmx.com>2017-10-30 10:15:31 +0100
commit5a10b4d6bf209aa95f5a675130da184343aa5fb3 (patch)
tree7ff058511ffd1d6721ec287239bd716144026979
parentman: systemd.offline-updates: remove link to the doc it obsoletes (#7189) (diff)
downloadsystemd-5a10b4d6bf209aa95f5a675130da184343aa5fb3.tar.xz
systemd-5a10b4d6bf209aa95f5a675130da184343aa5fb3.zip
fix compile error on musl
name '__in6_u.__u6_addr32' is specific to glibc use 's6_addr32' macro instead
-rw-r--r--src/core/ip-address-access.c4
-rw-r--r--src/shared/bus-unit-util.c4
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 0b8260193a..92a42b4718 100644
--- a/src/shared/bus-unit-util.c
+++ b/src/shared/bus-unit-util.c
@@ -511,7 +511,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)
@@ -527,7 +527,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)