瀏覽代碼

Merge branch 'bug31343_31374_035' into bug31343_31374_040

teor 4 年之前
父節點
當前提交
7502881deb
共有 2 個文件被更改,包括 5 次插入1 次删除
  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

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