fix new mingw64 compilation warnings

diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index fdab03d05abb55517087b041bc616e63276003fd..59ba1e6cb728f75c22c56e77b9f68adf5be5f4fc 100644 (file)
--- 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 fafb5bbbea173ccd6b920366de7965fab0374058..28c8f4e8efcc92e3e83cf0db90cf74fba1047ac3 100644 (file)
--- 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 4891356820688f5ed0adf148c5f121df14f4601b..15470e8efad1d1ebce7e3704836eafb687015d7a 100644 (file)
--- 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
   }