From 4100d7ad0fd1685daadebee6380b55dc43d1a944 Mon Sep 17 00:00:00 2001
From: mike <mike@FreeBSD.org>
Date: Wed, 10 Apr 2002 11:59:02 +0000
Subject: Unconditionalize the definition of INET_ADDRSTRLEN and
 INET6_ADDRSTRLEN.  Doing this helps expose bogus redefinitions in 3rd party
 software.

---
 sys/netinet/in.h   | 2 --
 sys/netinet6/in6.h | 2 --
 2 files changed, 4 deletions(-)

(limited to 'sys')

diff --git a/sys/netinet/in.h b/sys/netinet/in.h
index 893cc9b..92c8688 100644
--- a/sys/netinet/in.h
+++ b/sys/netinet/in.h
@@ -324,9 +324,7 @@ struct sockaddr_in {
 	char	sin_zero[8];
 };
 
-#ifndef INET_ADDRSTRLEN
 #define	INET_ADDRSTRLEN                 16
-#endif
 
 /*
  * Options for use with [gs]etsockopt at the IP level.
diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h
index a18dc13..059e7ae 100644
--- a/sys/netinet6/in6.h
+++ b/sys/netinet6/in6.h
@@ -132,9 +132,7 @@ 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.1