[tor-commits] [tor/master] Fix test.c compilation on mingw32.
nickm at torproject.org
nickm at torproject.org
Fri Nov 9 01:18:53 UTC 2012
commit 8b5d95db0df18bca6e608e95248340cf7f67b673
Author: Nick Mathewson <nickm at torproject.org>
Date: Thu Nov 8 20:09:06 2012 -0500
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.
---
src/test/test.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/test/test.c b/src/test/test.c
index 9848770..1eaa65c 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, \
More information about the tor-commits
mailing list