diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-08-17 20:44:54 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-08-17 20:44:54 +0000 |
| commit | f8b3927e076465808bd31e0e06712fb155ccf125 (patch) | |
| tree | 31242e84582a8814a5276d12e9dcbcddb88c73cf /src/or/test.c | |
| parent | cb7f4504e4dfcf04767f73c7014dea065d731655 (diff) | |
| download | tor-f8b3927e076465808bd31e0e06712fb155ccf125.tar.gz tor-f8b3927e076465808bd31e0e06712fb155ccf125.zip | |
r14634@catbus: nickm | 2007-08-17 16:43:49 -0400
Try to fix bug 482: do not rely on s6_addr16 or s6_addr32 on MSVC. How ugly.
svn:r11155
Diffstat (limited to 'src/or/test.c')
| -rw-r--r-- | src/or/test.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/test.c b/src/or/test.c index 2df0785f03..fbec7e87c1 100644 --- a/src/or/test.c +++ b/src/or/test.c @@ -1069,10 +1069,10 @@ _test_eq_ip6(struct in6_addr *a, struct in6_addr *b, const char *e1, * conventions of the other test macros. */ #define test_addr_parse_check(ip1, ip2, ip3, ip4, mm, pt1, pt2) STMT_BEGIN \ test_assert(r>=0); \ - test_eq(htonl(ip1), IN6_ADDRESS(&t1)->s6_addr32[0]); \ - test_eq(htonl(ip2), IN6_ADDRESS(&t1)->s6_addr32[1]); \ - test_eq(htonl(ip3), IN6_ADDRESS(&t1)->s6_addr32[2]); \ - test_eq(htonl(ip4), IN6_ADDRESS(&t1)->s6_addr32[3]); \ + test_eq(htonl(ip1), IN6_ADDRESS32(&t1)[0]); \ + test_eq(htonl(ip2), IN6_ADDRESS32(&t1)[1]); \ + test_eq(htonl(ip3), IN6_ADDRESS32(&t1)[2]); \ + test_eq(htonl(ip4), IN6_ADDRESS32(&t1)[3]); \ test_eq(mask, mm); \ test_eq(port1, pt1); \ test_eq(port2, pt2); \ |