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.
This commit is contained in:
Nick Mathewson 2018-06-28 13:40:21 -04:00
parent 7d7af19f1b
commit 0f02d2c041
3 changed files with 36 additions and 31 deletions

View File

@ -41,6 +41,7 @@ endif
TOR_UTIL_LIBS = \
src/common/libor.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 \
@ -49,7 +50,6 @@ TOR_UTIL_LIBS = \
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 \
@ -66,6 +66,7 @@ TOR_UTIL_LIBS = \
TOR_UTIL_TESTING_LIBS = \
src/common/libor-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 \
@ -74,7 +75,6 @@ TOR_UTIL_TESTING_LIBS = \
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 \

View File

@ -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

View File

@ -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>