From: Rich Felker Date: Thu, 6 Sep 2018 17:55:50 +0000 (-0400) Subject: make inadvertently exposed __pthread_{timed,try}join_np functions static X-Git-Tag: v1.1.21~157 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=10bbbbf5c63085b84d683c2d597ba482d6dd07d9;p=oweals%2Fmusl.git make inadvertently exposed __pthread_{timed,try}join_np functions static these exist for the sake of defining the corresponding weak public aliases (for C11 and POSIX namespace conformance reasons). they are not referenced by anything else in libc, so make them static. --- diff --git a/src/thread/pthread_join.c b/src/thread/pthread_join.c index 18264da6..551c3675 100644 --- a/src/thread/pthread_join.c +++ b/src/thread/pthread_join.c @@ -5,7 +5,7 @@ int __munmap(void *, size_t); void __pthread_testcancel(void); int __pthread_setcancelstate(int, int *); -int __pthread_timedjoin_np(pthread_t t, void **res, const struct timespec *at) +static int __pthread_timedjoin_np(pthread_t t, void **res, const struct timespec *at) { int state, cs, r = 0; __pthread_testcancel(); @@ -28,7 +28,7 @@ int __pthread_join(pthread_t t, void **res) return __pthread_timedjoin_np(t, res, 0); } -int __pthread_tryjoin_np(pthread_t t, void **res) +static int __pthread_tryjoin_np(pthread_t t, void **res) { return t->detach_state==DT_JOINABLE ? EBUSY : __pthread_join(t, res); }