nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tor-github/pr/1222' into combined31343_31374_035

Browse Source
This commit is contained in:
teor 2019-08-09 09:49:35 +10:00
commit 65343a966e
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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.

2
src/lib/time/compat_time.c
View File

@ -519,7 +519,7 @@ monotime_init_internal(void)
HANDLE h = load_windows_system_library(TEXT("kernel32.dll")); HANDLE h = load_windows_system_library(TEXT("kernel32.dll"));
if (h) { if (h) {
GetTickCount64_fn = (GetTickCount64_fn_t) GetTickCount64_fn = (GetTickCount64_fn_t) (void(*)(void))
GetProcAddress(h, "GetTickCount64"); GetProcAddress(h, "GetTickCount64");
} }
// FreeLibrary(h) ? // FreeLibrary(h) ?