diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-06-28 13:40:21 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-06-28 13:40:21 -0400 |
commit | 0f02d2c0411448668d2dfe11b61e1ea72ee7a3b2 (patch) | |
tree | b02ef89a4bb4e214f486211c51c154f67fc784d1 /Makefile.am | |
parent | 7d7af19f1b282554df5117c5c963736d0253a8d5 (diff) | |
download | tor-0f02d2c0411448668d2dfe11b61e1ea72ee7a3b2.tar.gz tor-0f02d2c0411448668d2dfe11b61e1ea72ee7a3b2.zip |
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.
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/Makefile.am b/Makefile.am index d28eb61493..162e56e762 100644 --- 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 = \ |