From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 5 Feb 2008 19:36:06 +0000 (+0000)
Subject: Apparently, our windows code for detecting ipv6 structures has worked for a while... 
X-Git-Tag: tor-0.2.0.19-alpha~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54029559d7153286b9c4fb2ba31a7efacc65181e;p=thirdparty%2Ftor.git

Apparently, our windows code for detecting ipv6 structures has worked for a while.  Remove the special-case, remove the related XXXX020s, and add useful comments instead.

svn:r13377
---

diff --git a/src/common/compat.h b/src/common/compat.h
index a94691d447..1ccfbe8a0b 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -271,8 +271,11 @@ int get_n_open_sockets(void);
 typedef int socklen_t;
 #endif
 
-/* XXXX020 detect in6_addr correctly on ms_windows; this is a hack. */
-#if !defined(HAVE_STRUCT_IN6_ADDR) && !defined(MS_WINDOWS)
+/* Define struct in6_addr on platforms that do not have it.  Generally,
+ * these platforms are ones without IPv6 support, but we want to have
+ * a working in6_addr there anyway, so we can use it to parse IPv6
+ * addresses. */
+#if !defined(HAVE_STRUCT_IN6_ADDR)
 struct in6_addr
 {
   union {
@@ -313,8 +316,9 @@ typedef uint16_t sa_family_t;
 #define S6_ADDR16(x) ((uint16_t*)((char*)&(x).s6_addr))
 #endif
 
-/* XXXX020 detect sockaddr_in6 correctly on ms_windows; this is also a hack. */
-#if !defined(HAVE_STRUCT_SOCKADDR_IN6) && !defined(MS_WINDOWS)
+/* Define struct sockaddr_in6 on platforms that do not have it. See notes
+ * on struct in6_addr. */
+#if !defined(HAVE_STRUCT_SOCKADDR_IN6)
 struct sockaddr_in6 {
   sa_family_t sin6_family;
   uint16_t sin6_port;