fluencelabs/musl
1
0
Fork 0
mirror of https://github.com/fluencelabs/musl synced 2025-04-25 07:12:15 +00:00
Code Issues Projects Releases Wiki Activity

fix namespace issue in pthread_join affecting thrd_join

Browse Source 
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.
This commit is contained in:
Rich Felker 2015-03-02 18:48:58 -05:00
parent 5451d95715
commit a3de8f7fbc
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/thread/pthread_join.c
View File

@ -2,11 +2,12 @@
#include <sys/mman.h> #include <sys/mman.h>
int __munmap(void *, size_t); int __munmap(void *, size_t);
void __pthread_testcancel(void);
int __pthread_join(pthread_t t, void **res) int __pthread_join(pthread_t t, void **res)
{ {
int tmp; int tmp;
pthread_testcancel(); __pthread_testcancel();
while ((tmp = t->tid)) __timedwait_cp(&t->tid, tmp, 0, 0, 0); while ((tmp = t->tid)) __timedwait_cp(&t->tid, tmp, 0, 0, 0);
if (res) *res = t->result; if (res) *res = t->result;
if (t->map_base) __munmap(t->map_base, t->map_size); if (t->map_base) __munmap(t->map_base, t->map_size);