Define jl_n_threads in only libjulia

staticfloat · staticfloat · commit d316c9831762 · 2021-01-15T00:00:39.000Z
Without this, it was defined in both `libjulia` and `libjulia-internal`, causing `libjulia-internal`'s updates to not be visible. (cherry picked from commit f1a39b6)
diff --git a/src/julia.h b/src/julia.h
@@ -1510,6 +1510,7 @@ JL_DLLEXPORT int jl_is_debugbuild(void) JL_NOTSAFEPOINT;
 JL_DLLEXPORT jl_sym_t *jl_get_UNAME(void) JL_NOTSAFEPOINT;
 JL_DLLEXPORT jl_sym_t *jl_get_ARCH(void) JL_NOTSAFEPOINT;
 JL_DLLEXPORT jl_value_t *jl_get_libllvm(void) JL_NOTSAFEPOINT;
+extern JL_DLLIMPORT int jl_n_threads;
 
 // environment entries
 JL_DLLEXPORT jl_value_t *jl_environ(int i);
diff --git a/src/threading.c b/src/threading.c
@@ -221,7 +221,6 @@ jl_get_ptls_states_func jl_get_ptls_states_getter(void)
 }
 #endif
 
-JL_DLLEXPORT int jl_n_threads;
 jl_ptls_t *jl_all_tls_states JL_GLOBALLY_ROOTED;
 
 // return calling thread's ID

Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,6 @@ jl_get_ptls_states_func jl_get_ptls_states_getter(void)`
`221`	`221`	`}`
`222`	`222`	`#endif`
`223`	`223`
`224`		`-JL_DLLEXPORT int jl_n_threads;`
`225`	`224`	`jl_ptls_t *jl_all_tls_states JL_GLOBALLY_ROOTED;`
`226`	`225`
`227`	`226`	`// return calling thread's ID`