From 3a280b35ee45a1e4f4edaa3891a13d449d87fa8b Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 8 Aug 2019 11:43:42 -0400
Subject: [PATCH] Fix a warning about casting the results of GetProcAddress.
Fixes bug 31374; bugfix on 0.2.9.1-alpha.
---
changes/ticket31374 | 4 ++++
src/common/compat_time.c | 3 +--
2 files changed, 5 insertions(+), 2 deletions(-)
create mode 100644 changes/ticket31374
diff --git a/changes/ticket31374 b/changes/ticket31374
new file mode 100644
index 0000000000..e8eef9cd49
--- /dev/null
+++ b/changes/ticket31374
@@ -0,0 +1,4 @@
+ o Minor bugfixes (compilation warning):
+ - Fix a compilation warning on Windows about casting a function
+ pointer for GetTickCount64(). Fixes bug 31374; bugfix on
+ 0.2.9.1-alpha.
diff --git a/src/common/compat_time.c b/src/common/compat_time.c
index d044bbe1d7..52da609db8 100644
--- a/src/common/compat_time.c
+++ b/src/common/compat_time.c
@@ -443,7 +443,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");
}
// FreeLibrary(h) ?
@@ -654,4 +654,3 @@ monotime_coarse_absolute_msec(void)
return monotime_coarse_absolute_nsec() / ONE_MILLION;
}
#endif
-
--
GitLab