Fix up some windows compilation issues.

These were mostly cases where our previous macros had been casting,
and the values that we were trying to printf were not in fact
uint64_t.

3 files changed, 22 insertions, 24 deletions

diff --git a/src/or/channel.c b/src/or/channel.c
index 9b57eccd7d..6ab02f3b29 100644
--- a/src/or/channel.c
+++ b/src/or/channel.c
@@ -2544,10 +2544,10 @@ channel_dump_statistics, (channel_t *chan, int severity))
       " (%"PRIu64 " seconds ago) "
       "and last active at %"PRIu64 " (%"PRIu64 " seconds ago)",
       (chan->global_identifier),
-      (chan->timestamp_created),
-      (now - chan->timestamp_created),
-      (chan->timestamp_active),
-      (now - chan->timestamp_active));
+      (uint64_t)(chan->timestamp_created),
+      (uint64_t)(now - chan->timestamp_created),
+      (uint64_t)(chan->timestamp_active),
+      (uint64_t)(now - chan->timestamp_active));
 
   /* Handle digest. */
   if (!tor_digest_is_zero(chan->identity_digest)) {
@@ -2624,20 +2624,20 @@ channel_dump_statistics, (channel_t *chan, int severity))
       " * Channel %"PRIu64 " was last used by a "
       "client at %"PRIu64 " (%"PRIu64 " seconds ago)",
       (chan->global_identifier),
-      (chan->timestamp_client),
-      (now - chan->timestamp_client));
+      (uint64_t)(chan->timestamp_client),
+      (uint64_t)(now - chan->timestamp_client));
   tor_log(severity, LD_GENERAL,
       " * Channel %"PRIu64 " last received a cell "
       "at %"PRIu64 " (%"PRIu64 " seconds ago)",
       (chan->global_identifier),
-      (chan->timestamp_recv),
-      (now - chan->timestamp_recv));
+      (uint64_t)(chan->timestamp_recv),
+      (uint64_t)(now - chan->timestamp_recv));
   tor_log(severity, LD_GENERAL,
       " * Channel %"PRIu64 " last transmitted a cell "
       "at %"PRIu64 " (%"PRIu64 " seconds ago)",
       (chan->global_identifier),
-      (chan->timestamp_xmit),
-      (now - chan->timestamp_xmit));
+      (uint64_t)(chan->timestamp_xmit),
+      (uint64_t)(now - chan->timestamp_xmit));
 
   /* Describe counters and rates */
   tor_log(severity, LD_GENERAL,
@@ -2727,19 +2727,19 @@ channel_listener_dump_statistics(channel_listener_t *chan_l, int severity)
       " (%"PRIu64 " seconds ago) "
       "and last active at %"PRIu64 " (%"PRIu64 " seconds ago)",
       (chan_l->global_identifier),
-      (chan_l->timestamp_created),
-      (now - chan_l->timestamp_created),
-      (chan_l->timestamp_active),
-      (now - chan_l->timestamp_active));
+      (uint64_t)(chan_l->timestamp_created),
+      (uint64_t)(now - chan_l->timestamp_created),
+      (uint64_t)(chan_l->timestamp_active),
+      (uint64_t)(now - chan_l->timestamp_active));
 
   tor_log(severity, LD_GENERAL,
       " * Channel listener %"PRIu64 " last accepted an incoming "
         "channel at %"PRIu64 " (%"PRIu64 " seconds ago) "
         "and has accepted %"PRIu64 " channels in total",
         (chan_l->global_identifier),
-        (chan_l->timestamp_accepted),
-        (now - chan_l->timestamp_accepted),
-        (chan_l->n_accepted));
+        (uint64_t)(chan_l->timestamp_accepted),
+        (uint64_t)(now - chan_l->timestamp_accepted),
+        (uint64_t)(chan_l->n_accepted));
 
   /*
    * If it's sensible to do so, get the rate of incoming channels on this
@@ -3477,4 +3477,3 @@ channel_update_bad_for_new_circs(const char *digest, int force)
     channel_rsa_id_group_set_badness(&(*iter)->channel_list, force);
   }
 }
-
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index a50477c4ca..0b5a6bf4f3 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -2601,10 +2601,10 @@ circuits_handle_oom(size_t current_allocation)
 
  done_recovering_mem:
 
-  log_notice(LD_GENERAL, "Removed %"PRIu64" bytes by killing %d circuits; "
+  log_notice(LD_GENERAL, "Removed %"TOR_PRIuSZ" bytes by killing %d circuits; "
              "%d circuits remain alive. Also killed %d non-linked directory "
              "connections.",
-             (mem_recovered),
+             mem_recovered,
              n_circuits_killed,
              smartlist_len(circlist) - n_circuits_killed,
              n_dirconns_killed);
diff --git a/src/or/directory.c b/src/or/directory.c
index 907995479a..3407ffa378 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -1929,8 +1929,8 @@ directory_send_command(dir_connection_t *conn,
 
   log_debug(LD_DIR,
             "Sent request to directory server '%s:%d': "
-            "(purpose: %d, request size: %"PRIu64 ", "
-            "payload size: %"PRIu64 ")",
+            "(purpose: %d, request size: %"TOR_PRIuSZ", "
+            "payload size: %"TOR_PRIuSZ")",
             conn->base_.address, conn->base_.port,
             conn->base_.purpose,
             (total_request_len),
@@ -2420,7 +2420,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
 
   tor_log(LOG_DEBUG, LD_DIR,
             "Received response from directory server '%s:%d': %d %s "
-            "(purpose: %d, response size: %"PRIu64
+            "(purpose: %d, response size: %"TOR_PRIuSZ
 #ifdef MEASUREMENTS_21206
             ", data cells received: %d, data cells sent: %d"
 #endif
@@ -5952,4 +5952,3 @@ dir_split_resource_into_spoolable(const char *resource,
   smartlist_free(fingerprints);
   return r;
 }
-