From: Roy Marples <roy@marples.name>
Date: Thu, 18 Sep 2014 08:52:46 +0000 (+0000)
Subject: Remove linux/ipv6.h from everywhere except ipv6.h.
X-Git-Tag: v6.4.5~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af68f3b8a40e43d7f42be9d45b0b31172a084148;p=thirdparty%2Fdhcpcd.git

Remove linux/ipv6.h from everywhere except ipv6.h.
Only bring in linux/ipv6.h if linux AND glibc.
---

diff --git a/dhcp6.c b/dhcp6.c
index fa636e9e..7b235fea 100644
--- a/dhcp6.c
+++ b/dhcp6.c
@@ -31,10 +31,6 @@
 #include <sys/utsname.h>
 
 #include <netinet/in.h>
-#ifdef __linux__
-#  define _LINUX_IN6_H
-#  include <linux/ipv6.h>
-#endif
 
 #include <ctype.h>
 #include <errno.h>
diff --git a/ipv6.h b/ipv6.h
index 088bfb3f..5c932aa2 100644
--- a/ipv6.h
+++ b/ipv6.h
@@ -33,7 +33,7 @@
 
 #include <netinet/in.h>
 
-#ifdef __linux__
+#if defined(__linux__) && defined(__GLIBC__)
 #  define _LINUX_IN6_H
 #  include <linux/ipv6.h>
 #endif
diff --git a/ipv6nd.c b/ipv6nd.c
index 801958f9..1dcb24a6 100644
--- a/ipv6nd.c
+++ b/ipv6nd.c
@@ -33,11 +33,6 @@
 #include <netinet/ip6.h>
 #include <netinet/icmp6.h>
 
-#ifdef __linux__
-#  define _LINUX_IN6_H
-#  include <linux/ipv6.h>
-#endif
-
 #include <errno.h>
 #include <fcntl.h>
 #include <stddef.h>