diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-08-08 11:46:24 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-08-08 11:46:24 -0400 |
| commit | b560d94ac0a9ccbc3db7b4a5611ef1ad4ee7628c (patch) | |
| tree | b969885af9e62c1e867fa7ff212bb5502774d3c7 | |
| parent | e83eabc9bfb6c07f80611beb6b02d43102806a0e (diff) | |
| parent | 3a280b35ee45a1e4f4edaa3891a13d449d87fa8b (diff) | |
| download | tor-b560d94ac0a9ccbc3db7b4a5611ef1ad4ee7628c.tar.gz tor-b560d94ac0a9ccbc3db7b4a5611ef1ad4ee7628c.zip | |
Merge branch 'ticket31374_029' into ticket31374_035
| -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 3d1ffa7af4..98854bad2c 100644 --- a/src/lib/time/compat_time.c +++ b/src/lib/time/compat_time.c @@ -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) ? |