Fix windows compilation in compat_time

We need to use lib/fs/winlib.h here so that we can use
GetTickCount64.

I would love to declare that XP is dead, and everybody has
GetTickCount64.

diff --git a/Makefile.am b/Makefile.am
index d28eb614933c41edd4040396d31a81c92daf5d12..162e56e7629ddb416d10e4a4d7e41ccf97dbec0b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,51 +40,51 @@ endif
 # "Common" libraries used to link tor's utility code.
 TOR_UTIL_LIBS = \
        src/common/libor.a \
-        src/lib/libtor-process.a \
-        src/lib/libtor-fs.a \
-        src/lib/libtor-encoding.a \
-        src/lib/libtor-sandbox.a \
+       src/lib/libtor-process.a \
+       src/lib/libtor-time.a \
+       src/lib/libtor-fs.a \
+       src/lib/libtor-encoding.a \
+       src/lib/libtor-sandbox.a \
        src/lib/libtor-container.a \
        src/lib/libtor-net.a \
-        src/lib/libtor-thread.a \
-        src/lib/libtor-memarea.a \
+       src/lib/libtor-thread.a \
+       src/lib/libtor-memarea.a \
        src/lib/libtor-math.a \
-       src/lib/libtor-time.a \
-        src/lib/libtor-log.a \
-        src/lib/libtor-lock.a \
-        src/lib/libtor-fdio.a \
-        src/lib/libtor-string.a \
-        src/lib/libtor-smartlist-core.a \
+       src/lib/libtor-log.a \
+       src/lib/libtor-lock.a \
+       src/lib/libtor-fdio.a \
+       src/lib/libtor-string.a \
+       src/lib/libtor-smartlist-core.a \
        src/lib/libtor-malloc.a \
-        src/lib/libtor-wallclock.a \
-        src/lib/libtor-err.a \
-        src/lib/libtor-intmath.a \
+       src/lib/libtor-wallclock.a \
+       src/lib/libtor-err.a \
+       src/lib/libtor-intmath.a \
        src/lib/libtor-ctime.a
 
 # Variants of the above for linking the testing variant of tor (for coverage
 # and tests)
 TOR_UTIL_TESTING_LIBS = \
        src/common/libor-testing.a \
-        src/lib/libtor-process-testing.a \
-        src/lib/libtor-fs-testing.a \
-        src/lib/libtor-encoding-testing.a \
-        src/lib/libtor-sandbox-testing.a \
+       src/lib/libtor-process-testing.a \
+       src/lib/libtor-time-testing.a \
+       src/lib/libtor-fs-testing.a \
+       src/lib/libtor-encoding-testing.a \
+       src/lib/libtor-sandbox-testing.a \
        src/lib/libtor-container-testing.a \
        src/lib/libtor-net-testing.a \
-        src/lib/libtor-thread-testing.a \
-        src/lib/libtor-memarea-testing.a \
+       src/lib/libtor-thread-testing.a \
+       src/lib/libtor-memarea-testing.a \
        src/lib/libtor-math-testing.a \
-       src/lib/libtor-time-testing.a \
-        src/lib/libtor-log-testing.a \
-        src/lib/libtor-lock-testing.a \
-        src/lib/libtor-fdio-testing.a \
-        src/lib/libtor-string-testing.a \
-        src/lib/libtor-smartlist-core-testing.a \
+       src/lib/libtor-log-testing.a \
+       src/lib/libtor-lock-testing.a \
+       src/lib/libtor-fdio-testing.a \
+       src/lib/libtor-string-testing.a \
+       src/lib/libtor-smartlist-core-testing.a \
        src/lib/libtor-malloc-testing.a \
-        src/lib/libtor-wallclock-testing.a \
-        src/lib/libtor-err-testing.a \
-        src/lib/libtor-intmath.a \
-        src/lib/libtor-ctime-testing.a
+       src/lib/libtor-wallclock-testing.a \
+       src/lib/libtor-err-testing.a \
+       src/lib/libtor-intmath.a \
+       src/lib/libtor-ctime-testing.a
 
 # Internal crypto libraries used in Tor
 TOR_CRYPTO_LIBS = \

diff --git a/src/lib/time/.may_include b/src/lib/time/.may_include
index a35e7a34e15693e1878d06ee693413c2a7c6939b..2c7e37a836cc36ac129d29e984f6e5f4d6b13965 100644 (file)
--- a/src/lib/time/.may_include
+++ b/src/lib/time/.may_include
@@ -6,3 +6,6 @@ lib/intmath/*.h
 lib/log/*.h
 lib/time/*.h
 lib/wallclock/*.h
+
+# For load_windows_system_lib.
+lib/fs/winlib.h
\ No newline at end of file

diff --git a/src/lib/time/compat_time.c b/src/lib/time/compat_time.c
index f50ccb5e3d58d1212ab5590f36df44f359d7e558..08f99b70c94d6b6a549e3361e3d580379d6f0a78 100644 (file)
--- a/src/lib/time/compat_time.c
+++ b/src/lib/time/compat_time.c
@@ -16,6 +16,8 @@
 #include "lib/log/torlog.h"
 #include "lib/log/util_bug.h"
 #include "lib/intmath/muldiv.h"
+#include "lib/fs/winlib.h"
+#include "lib/wallclock/timeval.h"
 
 #ifdef _WIN32
 #include <winsock2.h>