From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Mon, 25 Oct 2010 18:35:44 +0000 (-0700)
Subject: build - define struct in6_addr in arpa/inet.h
X-Git-Tag: v2.9.1~79
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/cca780f8209342019a22a0da7a5e8a1e0f575c76

build - define struct in6_addr in arpa/inet.h

* Use the same mechanic used for struct in_addr to define in6_addr in
  arpa/inet.h, conditionalizing the define in in6.h.

* This helps w/pkgsrc builds.
---

diff --git a/include/arpa/inet.h b/include/arpa/inet.h
index bd8a71d56d..7752ad4310 100644
--- a/include/arpa/inet.h
+++ b/include/arpa/inet.h
@@ -88,6 +88,17 @@ struct in_addr {
 #define	_STRUCT_IN_ADDR_DECLARED
 #endif
 
+#ifndef _STRUCT_IN6_ADDR_DECLARED
+struct in6_addr {
+	union {
+		uint8_t   __u6_addr8[16];
+		uint16_t  __u6_addr16[8];
+		uint32_t  __u6_addr32[4];
+	} __u6_addr;                    /* 128-bit IP6 address */
+};
+#define _STRUCT_IN6_ADDR_DECLARED
+#endif
+
 /* XXX all new diversions!! argh!! */
 #if __BSD_VISIBLE
 #define	inet_addr	__inet_addr
diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h
index 5b853e6e3d..7d2c64447f 100644
--- a/sys/netinet6/in6.h
+++ b/sys/netinet6/in6.h
@@ -123,6 +123,7 @@ typedef __socklen_t	socklen_t;
 /*
  * IPv6 address
  */
+#ifndef _STRUCT_IN6_ADDR_DECLARED
 struct in6_addr {
 	union {
 		uint8_t   __u6_addr8[16];
@@ -130,6 +131,8 @@ struct in6_addr {
 		uint32_t  __u6_addr32[4];
 	} __u6_addr;			/* 128-bit IP6 address */
 };
+#define _STRUCT_IN6_ADDR_DECLARED
+#endif
 
 #define s6_addr		__u6_addr.__u6_addr8
 #define _s6_addr16	__u6_addr.__u6_addr16		/* internal use */