Merge branch 'bug31343_31374_035' into bug31343_31374_040

diff --cc src/lib/time/compat_time.c
index c6625c78061f3923f017b1e2912045a09cef9e04,98854bad2c1315744baec7134c9261c4b30f7578..a047d6c2cdc3dd1620de22dd1205cfb47157dcf9
--- 1/src/lib/time/compat_time.c
--- 2/src/lib/time/compat_time.c
+++ b/src/lib/time/compat_time.c
@@@ -519,12 -519,10 +519,12 @@@ 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) ?
 +  // We can't call FreeLibrary(h) here, because freeing the handle may
 +  // unload the library, and cause future calls to GetTickCount64_fn()
 +  // to fail. See 29642 for details.
  }
  
  void