[tor-commits] [tor/master] Try a little harder to work around mingw clock_gettime weirdness

nickm at torproject.org nickm at torproject.org
Tue Jul 26 12:23:01 UTC 2016


commit 3f9c036821ee5b3c5f3958d7dc41d62a450da36e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 26 08:22:23 2016 -0400

    Try a little harder to work around mingw clock_gettime weirdness
---
 src/common/compat_time.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/common/compat_time.c b/src/common/compat_time.c
index a50760e..4757225 100644
--- a/src/common/compat_time.c
+++ b/src/common/compat_time.c
@@ -13,7 +13,6 @@
 #include "compat.h"
 
 #ifdef _WIN32
-#undef HAVE_CLOCK_GETTIME
 #include <winsock2.h>
 #include <windows.h>
 #endif
@@ -45,6 +44,10 @@
 #endif
 #endif
 
+#ifdef _WIN32
+#undef HAVE_CLOCK_GETTIME
+#endif
+
 #ifdef TOR_UNIT_TESTS
 /** Delay for <b>msec</b> milliseconds.  Only used in tests. */
 void



More information about the tor-commits mailing list