tor

commit 0e1fd6d61fb6ee1a13cd142ff4c3a58f2012033d
parent b47adcbcabf8b07ffb19b0cfeb02996b07104ccf
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu,  8 Aug 2019 15:25:00 -0400

Merge branch 'maint-0.4.1'

Diffstat:
A
changes/ticket31374
 | 
4
++++
M
src/lib/time/compat_time.c
 | 
2
+-

2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/changes/ticket31374 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/lib/time/compat_time.c b/src/lib/time/compat_time.c
@@ -527,7 +527,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