connman: fix both, glibc and musl gcc7 build

This commit is contained in:
Jürgen Buchmüller 2017-07-10 16:28:35 +02:00
parent cac9a1ead8
commit 2eadc95046

View file

@ -165,16 +165,24 @@ index c34e10a..eae66fc 100644
struct in6_addr ipi6_addr; /* src/dst IPv6 address */
unsigned int ipi6_ifindex; /* send/recv interface index */
--- src/inet.c 2016-04-18 09:04:30.000000000 +0200
+++ src/inet.c 2017-07-07 18:14:31.092850333 +0200
@@ -25,6 +25,11 @@
#include <config.h>
#endif
+++ src/inet.c 2017-07-10 16:25:33.100118139 +0200
@@ -21,6 +21,11 @@
*
*/
+#if !defined(__GLIBC__)
+/* Prevent inclusion of /usr/include/linux/if_ether.h */
+#define _LINUX_IF_ETHER_H
+/* Prevent inclusion of /usr/include/netinet/if_ether.h */
+#define _NETINET_IF_ETHER_H
+#endif
+
#define _GNU_SOURCE
#include <stdio.h>
#include <errno.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -34,6 +39,7 @@
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
+#include <linux/if_ether.h>
#include <linux/sockios.h>
#include <netdb.h>
#include <arpa/inet.h>