1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-12-24 17:51:17 +03:00
2000-04-17  Ulrich Drepper  <drepper@redhat.com>

	* elf/dl-lookup.c (add_dependency): Correct __builtin_expect use.
This commit is contained in:
Ulrich Drepper
2000-04-17 07:09:10 +00:00
parent e2947c429e
commit e3265f5bc5
4 changed files with 11 additions and 5 deletions

View File

@@ -121,11 +121,9 @@ pthread_cond_timedwait_relative(pthread_cond_t *cond,
pthread_extricate_if extr;
/* Check whether the mutex is locked and owned by this thread. */
if (mutex->__m_owner != self)
if (mutex->__m_kind != PTHREAD_MUTEX_FAST_NP && mutex->__m_owner != self)
return EINVAL;
already_canceled = 0;
/* Set up extrication interface */
extr.pu_object = cond;
extr.pu_extricate_func = cond_extricate_func;
@@ -149,7 +147,7 @@ pthread_cond_timedwait_relative(pthread_cond_t *cond,
pthread_mutex_unlock(mutex);
if (!timedsuspend(self, abstime) == 0) {
if (!timedsuspend(self, abstime)) {
int was_on_queue;
/* __pthread_lock will queue back any spurious restarts that