diff options
| author | Rich Felker <dalias@aerifal.cx> | 2015-03-02 18:48:58 -0500 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2015-03-02 18:48:58 -0500 |
| commit | a3de8f7fbc5a2cc838b96e8702363ef7682da5ae (patch) | |
| tree | deb831963f6197b6dc748b79a854abc0db26e73b /src/thread/pthread_join.c | |
| parent | 5451d95715e3b4b37a32b54695fd1efa2cf3d9da (diff) | |
| download | musl-a3de8f7fbc5a2cc838b96e8702363ef7682da5ae.tar.gz musl-a3de8f7fbc5a2cc838b96e8702363ef7682da5ae.tar.xz musl-a3de8f7fbc5a2cc838b96e8702363ef7682da5ae.zip | |
fix namespace issue in pthread_join affecting thrd_join
pthread_testcancel is not in the ISO C reserved namespace and thus cannot be used here. use the namespace-protected version of the function instead.
Diffstat (limited to 'src/thread/pthread_join.c')
| -rw-r--r-- | src/thread/pthread_join.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/thread/pthread_join.c b/src/thread/pthread_join.c index b4ff33a5..bf4f03ce 100644 --- a/src/thread/pthread_join.c +++ b/src/thread/pthread_join.c @@ -2,11 +2,12 @@ #include <sys/mman.h> int __munmap(void *, size_t); +void __pthread_testcancel(void); int __pthread_join(pthread_t t, void **res) { int tmp; - pthread_testcancel(); + __pthread_testcancel(); while ((tmp = t->tid)) __timedwait_cp(&t->tid, tmp, 0, 0, 0); if (res) *res = t->result; if (t->map_base) __munmap(t->map_base, t->map_size); |