[tor-commits] [tor/master] Fix some lingering windows compilation issues from Jenkins.

[nickm@xxxxxxxxxxxxxx]

commit 19f2057d4999b4dfe8b06feafb92063e803d02c2
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Jul 9 12:54:40 2018 -0400

    Fix some lingering windows compilation issues from Jenkins.
    
    These were caused by the recent refactoring.
---
 src/feature/nodelist/microdesc.c | 2 +-
 src/lib/encoding/time_fmt.c      | 5 +++++
 src/test/test_shared_random.c    | 5 +++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/feature/nodelist/microdesc.c b/src/feature/nodelist/microdesc.c
index 4d6285d6c..d9630b4f1 100644
--- a/src/feature/nodelist/microdesc.c
+++ b/src/feature/nodelist/microdesc.c
@@ -723,7 +723,7 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force)
       log_warn(LD_BUG, "Discontinuity in position in microdescriptor cache."
                "By my count, I'm at %"PRId64
                ", but I should be at %"PRId64,
-               (off), (off_real));
+               (int64_t)(off), (int64_t)(off_real));
       if (off_real >= 0)
         off = off_real;
     }
diff --git a/src/lib/encoding/time_fmt.c b/src/lib/encoding/time_fmt.c
index ea9c8e9fd..c2ff34a91 100644
--- a/src/lib/encoding/time_fmt.c
+++ b/src/lib/encoding/time_fmt.c
@@ -26,6 +26,11 @@
 #include <string.h>
 #include <time.h>
 
+#ifdef _WIN32
+/* For struct timeval */
+#include <winsock2.h>
+#endif
+
 /** As localtime_r, but defined for platforms that don't have it:
  *
  * Convert *<b>timep</b> to a struct tm in local time, and store the value in
diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c
index ccf051606..b0a9da003 100644
--- a/src/test/test_shared_random.c
+++ b/src/test/test_shared_random.c
@@ -30,6 +30,11 @@
 #include <sys/stat.h>
 #endif
 
+#ifdef _WIN32
+/* For mkdir */
+#include <direct.h>
+#endif
+
 static authority_cert_t *mock_cert;
 
 static authority_cert_t *

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits