From b548e009e38edc9f4c2f601bb913538c2b72ac70 Mon Sep 17 00:00:00 2001 From: Jameson Nash Date: Tue, 28 Jun 2016 23:22:57 -0400 Subject: [PATCH] win: cleanup build warnings --- src/threading.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/threading.c b/src/threading.c index 917e998e9df09..c24253bf4a9cd 100644 --- a/src/threading.c +++ b/src/threading.c @@ -18,6 +18,7 @@ #include #include #include +#include #include "julia.h" #include "julia_internal.h" @@ -104,11 +105,12 @@ BOOLEAN WINAPI DllMain(IN HINSTANCE hDllHandle, IN DWORD nReason, TlsFree(jl_tls_key); break; } + return 1; // success } JL_DLLEXPORT JL_CONST_FUNC jl_tls_states_t *(jl_get_ptls_states)(void) { - return TlsGetValue(jl_tls_key); + return (jl_tls_states_t*)TlsGetValue(jl_tls_key); } jl_get_ptls_states_func jl_get_ptls_states_getter(void) @@ -656,7 +658,7 @@ JL_DLLEXPORT void jl_threading_profile(void) if (!fork_ns) return; printf("\nti profile:\n"); - printf("prep: %g (%llu)\n", NS_TO_SECS(prep_ns), (unsigned long long)prep_ns); + printf("prep: %g (%" PRIu64 ")\n", NS_TO_SECS(prep_ns), prep_ns); uint64_t min, max, avg; ti_timings(fork_ns, &min, &max, &avg);