Skip to content

Commit

Permalink
Merge pull request #17233 from JuliaLang/kf/jn/personality
Browse files Browse the repository at this point in the history
win: cleanup build warnings
  • Loading branch information
Keno authored Jul 1, 2016
2 parents c02e156 + b548e00 commit c25935c
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/threading.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <inttypes.h>

#include "julia.h"
#include "julia_internal.h"
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit c25935c

Please sign in to comment.