From: Hans-Christian Noren Egtvedt <hegtvedt@cisco.com>
Date: Mon, 25 Sep 2017 14:39:32 +0000 (+0200)
Subject: sd-radv: avoid redefinition of struct in6_addr
X-Git-Tag: v237~129^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a2b193a55284ecb25e726d5563330787b49e89e;p=thirdparty%2Fsystemd.git

sd-radv: avoid redefinition of struct in6_addr

Both netinet/icmp6.h and linux/in6.h will define struct in6_addr, and in
user space we want to use the netinet/icmp6.h variant.

Fixes build problem:
In file included from src/libsystemd-network/sd-radv.c:23:0:
/home/hegtvedt/work/os/product/sunrise/root/_build/v2/include/linux/in6.h:30:8:
error: redefinition of 'struct in6_addr'
---

diff --git a/src/libsystemd-network/sd-radv.c b/src/libsystemd-network/sd-radv.c
index 46704acdefe..f6c984f0116 100644
--- a/src/libsystemd-network/sd-radv.c
+++ b/src/libsystemd-network/sd-radv.c
@@ -21,7 +21,6 @@
 #include <netinet/icmp6.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <linux/in6.h>
 
 #include "sd-radv.h"