Skip to content

Commit c25935c

Browse files
authored
Merge pull request #17233 from JuliaLang/kf/jn/personality
win: cleanup build warnings
2 parents c02e156 + b548e00 commit c25935c

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/threading.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include <stdio.h>
1919
#include <stdlib.h>
2020
#include <string.h>
21+
#include <inttypes.h>
2122

2223
#include "julia.h"
2324
#include "julia_internal.h"
@@ -104,11 +105,12 @@ BOOLEAN WINAPI DllMain(IN HINSTANCE hDllHandle, IN DWORD nReason,
104105
TlsFree(jl_tls_key);
105106
break;
106107
}
108+
return 1; // success
107109
}
108110

109111
JL_DLLEXPORT JL_CONST_FUNC jl_tls_states_t *(jl_get_ptls_states)(void)
110112
{
111-
return TlsGetValue(jl_tls_key);
113+
return (jl_tls_states_t*)TlsGetValue(jl_tls_key);
112114
}
113115

114116
jl_get_ptls_states_func jl_get_ptls_states_getter(void)
@@ -656,7 +658,7 @@ JL_DLLEXPORT void jl_threading_profile(void)
656658
if (!fork_ns) return;
657659

658660
printf("\nti profile:\n");
659-
printf("prep: %g (%llu)\n", NS_TO_SECS(prep_ns), (unsigned long long)prep_ns);
661+
printf("prep: %g (%" PRIu64 ")\n", NS_TO_SECS(prep_ns), prep_ns);
660662

661663
uint64_t min, max, avg;
662664
ti_timings(fork_ns, &min, &max, &avg);

0 commit comments

Comments
 (0)