diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-08-01 15:57:34 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-08-01 15:57:34 +0000 |
| commit | 484c8b776d6d3df9e3ef474ddd85d73b2da79594 (patch) | |
| tree | dff23f7c2e4158779fa157b3e18b54572ca4120e /src/or | |
| parent | 2872a433866620aec55344035c657a047fdcb4a3 (diff) | |
| download | tor-484c8b776d6d3df9e3ef474ddd85d73b2da79594.tar.gz tor-484c8b776d6d3df9e3ef474ddd85d73b2da79594.zip | |
r13872@Kushana: nickm | 2007-07-31 08:27:54 -0700
Rename IN4_ADDR and IN6_ADDR to try to avoid conflicting with Windows definitions. This may fix the windows build.
svn:r11011
Diffstat (limited to 'src/or')
| -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 85c7869419..d731fb24f0 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_ADDR(&t1)->s6_addr32[0]); \ - test_eq(htonl(ip2), IN6_ADDR(&t1)->s6_addr32[1]); \ - test_eq(htonl(ip3), IN6_ADDR(&t1)->s6_addr32[2]); \ - test_eq(htonl(ip4), IN6_ADDR(&t1)->s6_addr32[3]); \ + 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(mask, mm); \ test_eq(port1, pt1); \ test_eq(port2, pt2); \ |