diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-23 11:03:38 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-23 11:03:38 +0100 |
| commit | 8781f745556be5d7402d0f3adc67ecfe32fe04a0 (patch) | |
| tree | 2aa8cfb446bab0283ac5ce9d8b1bb8c7bc2f3926 /nsprpub/pr/src/pthreads/ptsynch.c | |
| parent | f3f9b7b06e37f870463a5f2196457cca6b10d700 (diff) | |
| download | UXP-8781f745556be5d7402d0f3adc67ecfe32fe04a0.tar UXP-8781f745556be5d7402d0f3adc67ecfe32fe04a0.tar.gz UXP-8781f745556be5d7402d0f3adc67ecfe32fe04a0.tar.lz UXP-8781f745556be5d7402d0f3adc67ecfe32fe04a0.tar.xz UXP-8781f745556be5d7402d0f3adc67ecfe32fe04a0.zip | |
Update NSPR to 4.18
Diffstat (limited to 'nsprpub/pr/src/pthreads/ptsynch.c')
| -rw-r--r-- | nsprpub/pr/src/pthreads/ptsynch.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/nsprpub/pr/src/pthreads/ptsynch.c b/nsprpub/pr/src/pthreads/ptsynch.c index 251205336..a93b74795 100644 --- a/nsprpub/pr/src/pthreads/ptsynch.c +++ b/nsprpub/pr/src/pthreads/ptsynch.c @@ -23,11 +23,6 @@ static pthread_condattr_t _pt_cvar_attr; #if defined(DEBUG) extern PTDebug pt_debug; /* this is shared between several modules */ - -#if defined(_PR_DCETHREADS) -static pthread_t pt_zero_tid; /* a null pthread_t (pthread_t is a struct - * in DCE threads) to compare with */ -#endif /* defined(_PR_DCETHREADS) */ #endif /* defined(DEBUG) */ #if defined(FREEBSD) @@ -263,12 +258,7 @@ static PRIntn pt_TimedWait( rv = pthread_cond_timedwait(cv, ml, &tmo); /* NSPR doesn't report timeouts */ -#ifdef _PR_DCETHREADS - if (rv == -1) return (errno == EAGAIN) ? 0 : errno; - else return rv; -#else return (rv == ETIMEDOUT) ? 0 : rv; -#endif } /* pt_TimedWait */ @@ -1171,14 +1161,14 @@ PR_IMPLEMENT(PRStatus) PR_DeleteSemaphore(const char *name) PR_IMPLEMENT(PRStatus) PRP_TryLock(PRLock *lock) { PRIntn rv = pthread_mutex_trylock(&lock->mutex); - if (rv == PT_TRYLOCK_SUCCESS) + if (rv == 0) { PR_ASSERT(PR_FALSE == lock->locked); lock->locked = PR_TRUE; lock->owner = pthread_self(); } /* XXX set error code? */ - return (PT_TRYLOCK_SUCCESS == rv) ? PR_SUCCESS : PR_FAILURE; + return (0 == rv) ? PR_SUCCESS : PR_FAILURE; } /* PRP_TryLock */ PR_IMPLEMENT(PRCondVar*) PRP_NewNakedCondVar(void) |