Merge branch 'ticket31374_029' into ticket31374_035

This commit is contained in:
Nick Mathewson 2019-08-08 11:46:24 -04:00
commit b560d94ac0
2 changed files with 5 additions and 1 deletions

4
changes/ticket31374 Normal file
View File

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

View File

@ -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");
}
// FreeLibrary(h) ?