Merge pull request #7218 from matijaskala/patch-4

fix compile errors on musl
This commit is contained in:
Alan Jenkins
2017-10-30 17:42:33 +00:00
committed by GitHub
4 changed files with 6 additions and 5 deletions
+2 -2
View File
@@ -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;
+1
View File
@@ -18,6 +18,7 @@
***/
#include <sys/prctl.h>
#include <sys/wait.h>
#include "sd-bus.h"
+2 -2
View File
@@ -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)
+1 -1
View File
@@ -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>