mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 14:51:11 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'tor-github/pr/1221' into combined31343_31374_029

Browse source
This commit is contained in:
teor 2019-08-09 09:48:41 +10:00
commit 2bc8989d83
No known key found for this signature in database
GPG key ID: 10FEAA0E7075672A
2 changed files with 5 additions and 2 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.

3
src/common/compat_time.c
View file

@ -443,7 +443,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) ?
@ -654,4 +654,3 @@ monotime_coarse_absolute_msec(void)
return monotime_coarse_absolute_nsec() / ONE_MILLION; return monotime_coarse_absolute_nsec() / ONE_MILLION;
} }
#endif #endif