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

name '__in6_u.__u6_addr32' is specific to glibc

use 's6_addr32' macro instead
---
 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 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)

From d7e454ba9c5b25bfecbe85000d673dc1c771fb71 Mon Sep 17 00:00:00 2001
From: Matija Skala <mskala@gmx.com>
Date: Mon, 30 Oct 2017 10:32:45 +0100
Subject: [PATCH 2/2] fix includes

sys/wait.h is needed for WEXITED macro

poll.h is more portable than sys/poll.h
---
 src/import/importd.c    | 1 +
 src/test/test-seccomp.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/import/importd.c b/src/import/importd.c
index 9b3fd06b52..22ac5fcc84 100644
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -18,6 +18,7 @@
 ***/
 
 #include <sys/prctl.h>
+#include <sys/wait.h>
 
 #include "sd-bus.h"
 
diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c
index 4d63b68809..e5f97894b7 100644
--- a/src/test/test-seccomp.c
+++ b/src/test/test-seccomp.c
@@ -17,12 +17,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <poll.h>
 #include <sched.h>
 #include <stdlib.h>
 #include <sys/eventfd.h>
 #include <sys/mman.h>
 #include <sys/personality.h>
-#include <sys/poll.h>
 #include <sys/shm.h>
 #include <sys/types.h>
 #include <unistd.h>