[tor-commits] [tor/master] On Windows, tv_sec is long, not time_t.

nickm at torproject.org nickm at torproject.org
Thu Jun 16 17:57:40 UTC 2016


commit dd73787190ebe9821f8c3574fc1c08d54314699e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 16 13:57:16 2016 -0400

    On Windows, tv_sec is long, not time_t.
    
    I'm not angry, Windows: just very disappointed.
---
 src/test/test_util.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/test/test_util.c b/src/test/test_util.c
index 6090dbd..55aff31 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -293,7 +293,12 @@ test_util_time(void *arg)
   tt_int_op(-1005000L,OP_EQ, tv_udiff(&start, &end));
   tt_int_op(-1005L,OP_EQ, tv_mdiff(&start, &end));
 
+#ifdef _WIN32
+  /* Would you believe that tv_sec is a long on windows? Of course you would.*/
+  end.tv_sec = LONG_MAX;
+#else
   end.tv_sec = TIME_MAX;
+#endif
   tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&start, &end));
   tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&start, &end));
 



More information about the tor-commits mailing list