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 fa636e9e34bc435f63884a7f5108cb44b9b9999b..7b235feafcfd0cc78b7cf579ef6ef5e028771aee 100644 (file)
--- 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 088bfb3f3e5fffa07899c262a0cedcef8cf31d29..5c932aa266e4a82790ec18e7858f7ec3a050dd2a 100644 (file)
--- 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 801958f987e0c7e14dd0795ec59be75314ab742f..1dcb24a66fe66f446748ad117417397265f6d20d 100644 (file)
--- 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>