tor

commit 7502881deb0ba702d2a6a2ea3d4d24cd998e8616
parent e609f003425ee9dff9bebbf4f5c683b8395a5c89
Author: teor <teor@torproject.org>
Date:   Fri,  9 Aug 2019 09:51:40 +1000

Merge branch 'bug31343_31374_035' into bug31343_31374_040

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