fix namespace violation for c11 mutex functions
authorRich Felker <dalias@aerifal.cx>
Wed, 5 Sep 2018 02:56:57 +0000 (22:56 -0400)
committerRich Felker <dalias@aerifal.cx>
Wed, 5 Sep 2018 02:56:57 +0000 (22:56 -0400)
__pthread_mutex_timedlock is used to implement c11 mutex functions,
and therefore cannot call pthread_mutex_trylock by name.

src/thread/pthread_mutex_timedlock.c

index f91f4a61b642e02c5cb7dbbb3697f57ffce20989..d2bd196021d171540244a4cb3c8d09b8df58fd18 100644 (file)
@@ -1,5 +1,7 @@
 #include "pthread_impl.h"
 
+int __pthread_mutex_trylock(pthread_mutex_t *);
+
 int __pthread_mutex_timedlock(pthread_mutex_t *restrict m, const struct timespec *restrict at)
 {
        if ((m->_m_type&15) == PTHREAD_MUTEX_NORMAL
@@ -15,7 +17,7 @@ int __pthread_mutex_timedlock(pthread_mutex_t *restrict m, const struct timespec
        int spins = 100;
        while (spins-- && m->_m_lock && !m->_m_waiters) a_spin();
 
-       while ((r=pthread_mutex_trylock(m)) == EBUSY) {
+       while ((r=__pthread_mutex_trylock(m)) == EBUSY) {
                if (!(r=m->_m_lock) || ((r&0x40000000) && (type&4)))
                        continue;
                if ((type&3) == PTHREAD_MUTEX_ERRORCHECK