aboutsummaryrefslogtreecommitdiff
path: root/src/lib/time
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-08-09 09:51:40 +1000
committerteor <teor@torproject.org>2019-08-09 09:51:40 +1000
commit7502881deb0ba702d2a6a2ea3d4d24cd998e8616 (patch)
tree4b7e9fafa3a93573e440d7c699fbf3b2cc194e22 /src/lib/time
parente609f003425ee9dff9bebbf4f5c683b8395a5c89 (diff)
parentd4184fca30eedc8fdd82f87f34151a9e6558e176 (diff)
downloadtor-7502881deb0ba702d2a6a2ea3d4d24cd998e8616.tar.gz
tor-7502881deb0ba702d2a6a2ea3d4d24cd998e8616.zip
Merge branch 'bug31343_31374_035' into bug31343_31374_040
Diffstat (limited to 'src/lib/time')
-rw-r--r--src/lib/time/compat_time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/time/compat_time.c b/src/lib/time/compat_time.c
index c6625c7806..a047d6c2cd 100644
--- a/src/lib/time/compat_time.c
+++ b/src/lib/time/compat_time.c
@@ -519,7 +519,7 @@ monotime_init_internal(void)
HANDLE h = load_windows_system_library(TEXT("kernel32.dll"));
if (h) {
- GetTickCount64_fn = (GetTickCount64_fn_t)
+ GetTickCount64_fn = (GetTickCount64_fn_t) (void(*)(void))
GetProcAddress(h, "GetTickCount64");
}
// We can't call FreeLibrary(h) here, because freeing the handle may