diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-08-08 15:24:52 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-08-08 15:24:52 -0400 |
| commit | 53d5b67f07446f5f4100db032cd47281e0cfd7b1 (patch) | |
| tree | 7d469d99ab98f31d7d7b8156ae54a3ad94033eb3 | |
| parent | 0bc5b7ae95a2cc11b380ba09aab0ed1f4219f90b (diff) | |
| parent | b560d94ac0a9ccbc3db7b4a5611ef1ad4ee7628c (diff) | |
| download | tor-53d5b67f07446f5f4100db032cd47281e0cfd7b1.tar.gz tor-53d5b67f07446f5f4100db032cd47281e0cfd7b1.zip | |
Merge branch 'ticket31374_035' into maint-0.4.1
| -rw-r--r-- | changes/ticket31374 | 4 | ||||
| -rw-r--r-- | src/lib/time/compat_time.c | 2 |
2 files changed, 5 insertions, 1 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/lib/time/compat_time.c b/src/lib/time/compat_time.c index 7136eaba67..3f41500f3a 100644 --- a/src/lib/time/compat_time.c +++ b/src/lib/time/compat_time.c @@ -527,7 +527,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 |