]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
Fix redefinition of struct in6_addr 1029/head
authorJörg Krause <joerg.krause@embedded.rocks>
Thu, 19 May 2016 19:51:27 +0000 (21:51 +0200)
committerJörg Krause <joerg.krause@embedded.rocks>
Mon, 23 May 2016 18:55:46 +0000 (20:55 +0200)
struct in6_addr is both defined in the C library header <netinet/in.h>
and the Linux kernel header <linux/in6.h>.

lxc_user_nic.c includes both <netinet/in.h> and <linux/if_bridge.h>. The
later one includes <linux/in6.h>.

This breaks build with the musl libc:
  error: redefinition of ‘struct in6_addr’

As lxc_user_nic.c does not use any references from <linux/if_bridge.h> it
is safe to remove this header.

Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
src/lxc/lxc_user_nic.c

index 87780cab7b469718d1bf7a722142be96f72b64c2..0cb38ba0b02e241f18735fa604f7d8259acf1426 100644 (file)
@@ -41,7 +41,6 @@
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <netinet/in.h>
-#include <linux/if_bridge.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
 #include <linux/sockios.h>