[tor-commits] [tor/master] fix new mingw64 compilation warnings

[nickm at torproject.org]

commit 6f171003ce8e96e2138825d693e7293fd909956f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 8 10:44:30 2015 -0500

    fix new mingw64 compilation warnings
---
 src/or/networkstatus.c    |    3 ++-
 src/test/test_relaycell.c |    2 +-
 src/test/test_util.c      |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index fdab03d..59ba1e6 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -876,7 +876,8 @@ update_consensus_networkstatus_fetch_time_impl(time_t now, int flav)
     log_debug(LD_DIR,
               "fresh_until: %ld start: %ld "
               "dl_interval: %ld valid_until: %ld ",
-              c->fresh_until, start, dl_interval, c->valid_until);
+              (long)c->fresh_until, (long)start, dl_interval,
+              (long)c->valid_until);
     /* We must not try to replace c while it's still fresh: */
     tor_assert(c->fresh_until < start);
     /* We must download the next one before c is invalid: */
diff --git a/src/test/test_relaycell.c b/src/test/test_relaycell.c
index fafb5bb..28c8f4e 100644
--- a/src/test/test_relaycell.c
+++ b/src/test/test_relaycell.c
@@ -104,7 +104,7 @@ test_relaycell_resolved(void *arg)
       tt_int_op(srm_answer_is_set, OP_EQ, 0);                        \
     }                                                             \
     tt_int_op(srm_ttl, OP_EQ, ttl);                                  \
-    tt_int_op(srm_expires, OP_EQ, expires);                          \
+    tt_i64_op(srm_expires, OP_EQ, expires);                          \
   } while (0)
 
   (void)arg;
diff --git a/src/test/test_util.c b/src/test/test_util.c
index 4891356..15470e8 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -4851,7 +4851,7 @@ test_util_max_mem(void *arg)
   } else {
     /* You do not have a petabyte. */
 #if SIZEOF_SIZE_T == SIZEOF_UINT64_T
-    tt_uint_op(memory1, OP_LT, (U64_LITERAL(1)<<50));
+    tt_u64_op(memory1, OP_LT, (U64_LITERAL(1)<<50));
 #endif
   }