X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fpthread_cond_timedwait.c;h=13728282df2313b8b4ae2f1b19cac0a6ec2c5861;hb=4c4e22d781d75a461097cccc2ecac5adbafb1a59;hp=b67dded44bcb4d0cb8b3eecdfccc91b1435ef7ad;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01;p=musl

diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
index b67dded4..13728282 100644
--- a/src/thread/pthread_cond_timedwait.c
+++ b/src/thread/pthread_cond_timedwait.c
@@ -8,19 +8,19 @@ static void relock(void *m)
 int pthread_cond_timedwait(pthread_cond_t *c, pthread_mutex_t *m, const struct timespec *ts)
 {
 	int r, e=0;
-	CANCELPT(0);
+
+	pthread_testcancel();
 
 	pthread_cleanup_push(relock, m);
-	c->__block = 1;
+	c->_c_block = 1;
 	if ((r=pthread_mutex_unlock(m))) return r;
 
-	CANCELPT(1);
-	e = __timedwait(&c->__block, 1, CLOCK_REALTIME, ts, 0);
-	CANCELPT(0);
+	do e = __timedwait_cp(&c->_c_block, 1, c->_c_clock, ts, 0);
+	while (e == EINTR);
 
 	pthread_cleanup_pop(0);
 	if ((r=pthread_mutex_lock(m))) return r;
 
-	CANCELPT(0);
+	pthread_testcancel();
 	return e;
 }