From: Roy Marples <roy@marples.name>
Date: Tue, 26 Jul 2016 21:09:35 +0000 (+0000)
Subject: Remove Solaris IN6_IFF_* defines from configure and add the to ipv6.h,
X-Git-Tag: v6.11.2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb1838f3ed32b95993d0cf4ddddbd7ea0724d3dc;p=thirdparty%2Fdhcpcd.git

Remove Solaris IN6_IFF_* defines from configure and add the to ipv6.h,
similar to Linux.
While here, add IN_IFF_* counter-parts in ipv4.h.
---

diff --git a/configure b/configure
index 755e29cf..0f22c869 100755
--- a/configure
+++ b/configure
@@ -416,11 +416,6 @@ sunos*)
 	    >>$CONFIG_MK
 	echo "DHCPCD_SRCS+=	if-sun.c" >>$CONFIG_MK
 	echo "LDADD+=		-ldlpi" >>$CONFIG_MK
-
-	# IPv6 won't work, but it will at least compile.
-	echo "CPPFLAGS+=	-DIN6_IFF_DETACHED=0" >>$CONFIG_MK
-	echo "CPPFLAGS+=	-DIN6_IFF_TENTATIVE=0" >>$CONFIG_MK
-	echo "CPPFLAGS+=	-DIN6_IFF_DUPLICATED=0" >>$CONFIG_MK
 	;;
 *)
 	echo "DHCPCD_SRCS+=	if-bsd.c" >>$CONFIG_MK
diff --git a/ipv4.h b/ipv4.h
index 66425f88..f10eff33 100644
--- a/ipv4.h
+++ b/ipv4.h
@@ -30,6 +30,16 @@
 
 #include "dhcpcd.h"
 
+#ifdef __sun
+   /* Solaris lacks these defines.
+    * While it supports DaD, to seems to only expose IFF_DUPLICATE
+    * so we have no way of knowing if it's tentative or not.
+    * I don't even know if Solaris has any special treatment for tentative. */
+#  define IN_IFF_TENTATIVE	0
+#  define IN_IFF_DUPLICATED	0x02
+#  define IN_IFF_DETACHED	0
+#endif
+
 #ifdef IN_IFF_TENTATIVE
 #define IN_IFF_NOTUSEABLE \
         (IN_IFF_TENTATIVE | IN_IFF_DUPLICATED | IN_IFF_DETACHED)
diff --git a/ipv6.h b/ipv6.h
index 5d7285c3..94033032 100644
--- a/ipv6.h
+++ b/ipv6.h
@@ -44,6 +44,16 @@
 #  endif
 #endif
 
+#ifdef __sun
+   /* Solaris lacks these defines.
+    * While it supports DaD, to seems to only expose IFF_DUPLICATE
+    * so we have no way of knowing if it's tentative or not.
+    * I don't even know if Solaris has any special treatment for tentative. */
+#  define IN6_IFF_TENTATIVE	0
+#  define IN6_IFF_DUPLICATED	0x04
+#  define IN6_IFF_DETACHED	0
+#endif
+
 #define ALLROUTERS "ff02::2"
 
 #define EUI64_GBIT		0x01