X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_join.c;h=ba7bb7d54be15ca9ad911af060e2dd75f258abc1;hp=5210ed4835b760769b3836e4ba0cf4fab03d9b0a;hb=6232b96f5153d0b718054a8bc569fcd7d596bab2;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01 diff --git a/src/thread/pthread_join.c b/src/thread/pthread_join.c index 5210ed48..ba7bb7d5 100644 --- a/src/thread/pthread_join.c +++ b/src/thread/pthread_join.c @@ -3,9 +3,7 @@ int pthread_join(pthread_t t, void **res) { int tmp = t->tid; - CANCELPT_BEGIN; - if (tmp) __wait(&t->tid, 0, tmp, 1); - CANCELPT_END; + if (tmp) __timedwait_cp(&t->tid, tmp, 0, 0, 1); if (res) *res = t->result; if (t->map_base) munmap(t->map_base, t->map_size); return 0;