diff options
| author | teor <teor@torproject.org> | 2019-08-09 09:48:41 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-08-09 09:48:41 +1000 |
| commit | 2bc8989d833c3b583395380031e9b730d1c3fb37 (patch) | |
| tree | 8f39dd1610bffed4f88b42a257f60aa468068702 | |
| parent | 7667c1cbaffeb4c1df9241d80d84d27f3f9bde18 (diff) | |
| parent | 3a280b35ee45a1e4f4edaa3891a13d449d87fa8b (diff) | |
| download | tor-2bc8989d833c3b583395380031e9b730d1c3fb37.tar.gz tor-2bc8989d833c3b583395380031e9b730d1c3fb37.zip | |
Merge remote-tracking branch 'tor-github/pr/1221' into combined31343_31374_029
| -rw-r--r-- | changes/ticket31374 | 4 | ||||
| -rw-r--r-- | src/common/compat_time.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/changes/ticket31374 b/changes/ticket31374 new file mode 100644 index 0000000000..e8eef9cd49 --- /dev/null +++ b/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. diff --git a/src/common/compat_time.c b/src/common/compat_time.c index d044bbe1d7..52da609db8 100644 --- a/src/common/compat_time.c +++ b/src/common/compat_time.c @@ -443,7 +443,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) ? @@ -654,4 +654,3 @@ monotime_coarse_absolute_msec(void) return monotime_coarse_absolute_nsec() / ONE_MILLION; } #endif - |