From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 9 Nov 2012 01:09:06 +0000 (-0500)
Subject: Fix test.c compilation on mingw32.
X-Git-Tag: tor-0.2.4.6-alpha~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b5d95db0df18bca6e608e95248340cf7f67b673;p=thirdparty%2Ftor.git

Fix test.c compilation on mingw32.

Looks like windows doesn't have an s6_addr32 in its in6_addr.

Bug not in any released version of Tor; bugfix on abb886014e1ee.
---

diff --git a/src/test/test.c b/src/test/test.c
index 9848770a84..1eaa65c783 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -1547,7 +1547,10 @@ test_geoip(void)
   memset(&in6, 0, sizeof(in6));
 
   /* Make sure that country ID actually works. */
-#define SET_TEST_IPV6(i) in6.s6_addr32[3] = htonl((uint32_t) i)
+#define SET_TEST_IPV6(i) \
+  do {                                                          \
+    set_uint32(in6.s6_addr + 12, htonl((uint32_t) (i)));        \
+  } while (0)
 #define CHECK_COUNTRY(country, val) do {                                \
     /* test ipv4 country lookup */                                      \
     test_streq(country,                                                 \