Parcourir la source

Merge branch 'ticket31374_035' into maint-0.4.1

Nick Mathewson il y a 4 ans
Parent
commit
53d5b67f07
2 fichiers modifiés avec 5 ajouts et 1 suppressions
  1. 4 0
      changes/ticket31374
  2. 1 1
      src/lib/time/compat_time.c

+ 4 - 0
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.

+ 1 - 1
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