aboutsummaryrefslogtreecommitdiff
path: root/src/common/compat.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-08-02 17:30:42 +0000
committerNick Mathewson <nickm@torproject.org>2007-08-02 17:30:42 +0000
commitba28346f2f0f4c01fedb3d0039d2265af5b3ce1b (patch)
treeff7b8842a69744c779e67ec9f6022f5d6c08ee86 /src/common/compat.h
parent0b7d7ef4a6762cc6a9c726c80ab633b9885916a9 (diff)
downloadtor-ba28346f2f0f4c01fedb3d0039d2265af5b3ce1b.tar
tor-ba28346f2f0f4c01fedb3d0039d2265af5b3ce1b.tar.gz
r13907@Kushana: nickm | 2007-08-02 10:29:13 -0700
Try (once again) to fix mingw build wrt detecting ipv6 types. svn:r11037
Diffstat (limited to 'src/common/compat.h')
-rw-r--r--src/common/compat.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/common/compat.h b/src/common/compat.h
index 1923e3504..9e3069d1f 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -294,9 +294,14 @@ struct in6_addr
#endif
#endif
-#if !defined(HAVE_STRUCT_SOCKADDR_IN6)
+#ifndef HAVE_SA_FAMILY_T
+typedef uint16_t sa_family_t;
+#endif
+
+/* XXXX020 detect sockaddr_in6 correctly on ms_windows; this is also a hack. */
+#if !defined(HAVE_STRUCT_SOCKADDR_IN6) && !defined(MS_WINDOWS)
struct sockaddr_in6 {
- uint16_t sin6_family; /* XXXX020 right size???? */
+ sa_family_t sin6_family;
uint16_t sin6_port;
// uint32_t sin6_flowinfo;
struct in6_addr sin6_addr;