From 8a386e18f9ebed887bd888ffd5bede8694b2ef62 Mon Sep 17 00:00:00 2001
From: Philip Guenthe <guenther@cvs.openbsd.org>
Date: Tue, 10 Jul 2012 11:49:43 +0000
Subject: Instead of <arpa/inet.h> pulling in <netinet/in.h>, just copy in the
 three things that it needed from there: INET_ADDRSTRLEN, INET6_ADDRSTRLEN,
 and struct in_addr.  Add protecting #ifndefs to netinet6?/in6?.h for those.

ok deraadt@
---
 sys/netinet6/in6.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'sys/netinet6')

diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h
index 72fd35c3139..664bca96119 100644
--- a/sys/netinet6/in6.h
+++ b/sys/netinet6/in6.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6.h,v 1.56 2012/06/26 06:39:27 guenther Exp $	*/
+/*	$OpenBSD: in6.h,v 1.57 2012/07/10 11:49:42 guenther Exp $	*/
 /*	$KAME: in6.h,v 1.83 2001/03/29 02:55:07 jinmei Exp $	*/
 
 /*
@@ -94,7 +94,9 @@ struct in6_addr {
 #define s6_addr32 __u6_addr.__u6_addr32
 #endif
 
+#ifndef INET6_ADDRSTRLEN
 #define INET6_ADDRSTRLEN	46
+#endif
 
 /*
  * Socket address for IPv6
-- 
cgit v1.2.3