[tor-commits] [tor/maint-0.3.5] Fix a warning about casting the results of GetProcAddress.

teor at torproject.org teor at torproject.org
Fri Aug 9 00:53:37 UTC 2019


commit 3a280b35ee45a1e4f4edaa3891a13d449d87fa8b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 8 11:43:42 2019 -0400

    Fix a warning about casting the results of GetProcAddress.
    
    Fixes bug 31374; bugfix on 0.2.9.1-alpha.
---
 changes/ticket31374      | 4 ++++
 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 000000000..e8eef9cd4
--- /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 d044bbe1d..52da609db 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
-





More information about the tor-commits mailing list