summaryrefslogtreecommitdiff
path: root/src/test/test_addr.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-12-07 14:12:17 -0500
committerNick Mathewson <nickm@torproject.org>2012-12-07 14:12:17 -0500
commit3fa9151f2610fdad23df02b2b914881286b22480 (patch)
treeef9f91dfb3c886a59cc591739dc7ddb6f8a703a5 /src/test/test_addr.c
parentcd4f56a37c3513cdca3463c3638067380af29219 (diff)
parent4458fd0cd8fa259f0ee8195e1aa86d5b7c6f8919 (diff)
downloadtor-3fa9151f2610fdad23df02b2b914881286b22480.tar.gz
tor-3fa9151f2610fdad23df02b2b914881286b22480.zip
Merge branch 'win64-7260'
Conflicts: src/or/dns.c
Diffstat (limited to 'src/test/test_addr.c')
-rw-r--r--src/test/test_addr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/test_addr.c b/src/test/test_addr.c
index 586ceb6102..d2b25e5e6c 100644
--- a/src/test/test_addr.c
+++ b/src/test/test_addr.c
@@ -38,7 +38,7 @@ test_addr_basic(void)
tor_free(cp);
u32 = 3;
test_assert(!addr_port_lookup(LOG_WARN, "localhost", NULL, &u32, &u16));
- test_eq(cp, NULL);
+ test_eq_ptr(cp, NULL);
test_eq(u32, 0x7f000001u);
test_eq(u16, 0);
tor_free(cp);