summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--misc/dispatch.c2
-rw-r--r--osdep/threads.c4
-rw-r--r--osdep/threads.h4
-rw-r--r--stream/cache.c4
4 files changed, 7 insertions, 7 deletions
diff --git a/misc/dispatch.c b/misc/dispatch.c
index 4a5972aff2..a28360d16c 100644
--- a/misc/dispatch.c
+++ b/misc/dispatch.c
@@ -198,7 +198,7 @@ void mp_dispatch_queue_process(struct mp_dispatch_queue *queue, double timeout)
}
} else {
if (timeout > 0) {
- mpthread_cond_timed_wait(&queue->cond, &queue->lock, timeout);
+ mpthread_cond_timedwait(&queue->cond, &queue->lock, timeout);
} else {
pthread_cond_wait(&queue->cond, &queue->lock);
}
diff --git a/osdep/threads.c b/osdep/threads.c
index 6b19f83f1d..84a65feddd 100644
--- a/osdep/threads.c
+++ b/osdep/threads.c
@@ -62,8 +62,8 @@ struct timespec mpthread_get_deadline(double timeout)
}
// Call pthread_cond_timedwait() with a relative timeout in seconds
-int mpthread_cond_timed_wait(pthread_cond_t *cond, pthread_mutex_t *mutex,
- double timeout)
+int mpthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
+ double timeout)
{
struct timespec ts = mpthread_get_deadline(timeout);
return pthread_cond_timedwait(cond, mutex, &ts);
diff --git a/osdep/threads.h b/osdep/threads.h
index 3d060009cb..02f6ac1489 100644
--- a/osdep/threads.h
+++ b/osdep/threads.h
@@ -5,8 +5,8 @@
struct timespec mpthread_get_deadline(double timeout);
-int mpthread_cond_timed_wait(pthread_cond_t *cond, pthread_mutex_t *mutex,
- double timeout);
+int mpthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
+ double timeout);
int mpthread_mutex_init_recursive(pthread_mutex_t *mutex);
diff --git a/stream/cache.c b/stream/cache.c
index a377d4c96a..57b7b9271c 100644
--- a/stream/cache.c
+++ b/stream/cache.c
@@ -167,7 +167,7 @@ static int cache_wakeup_and_wait(struct priv *s, double *retry_time)
}
pthread_cond_signal(&s->wakeup);
- mpthread_cond_timed_wait(&s->wakeup, &s->mutex, CACHE_WAIT_TIME);
+ mpthread_cond_timedwait(&s->wakeup, &s->mutex, CACHE_WAIT_TIME);
*retry_time += mp_time_sec() - start;
@@ -529,7 +529,7 @@ static void *cache_thread(void *arg)
s->control = CACHE_CTRL_NONE;
}
if (s->idle && s->control == CACHE_CTRL_NONE)
- mpthread_cond_timed_wait(&s->wakeup, &s->mutex, CACHE_IDLE_SLEEP_TIME);
+ mpthread_cond_timedwait(&s->wakeup, &s->mutex, CACHE_IDLE_SLEEP_TIME);
}
pthread_cond_signal(&s->wakeup);
pthread_mutex_unlock(&s->mutex);