diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-05-26 02:47:39 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-05-26 02:47:39 +0000 |
| commit | 69431c9a21f7393f34330a27df1630520930789e (patch) | |
| tree | 1fbd3f1520502c833e676afa3fb5410f92654f85 /nptl/pthread_mutex_lock.c | |
| parent | 6a998b09ec734d8dd40e690244122a43bf9d7a16 (diff) | |
Update.
2003-05-25 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/kernel-features.h: Define
__ASSUME_FUTEX_REQUEUE for >= 2.5.70.
* math/test-fenv.c (feexcp_nomask_test): Fix comment.
Diffstat (limited to 'nptl/pthread_mutex_lock.c')
| -rw-r--r-- | nptl/pthread_mutex_lock.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/nptl/pthread_mutex_lock.c b/nptl/pthread_mutex_lock.c index f70445acfc..4fdb13718c 100644 --- a/nptl/pthread_mutex_lock.c +++ b/nptl/pthread_mutex_lock.c @@ -22,6 +22,11 @@ #include <lowlevellock.h> +#ifndef LLL_MUTEX_LOCK +# define LLL_MUTEX_LOCK(mutex) lll_mutex_lock (mutex) +#endif + + int __pthread_mutex_lock (mutex) pthread_mutex_t *mutex; @@ -45,7 +50,7 @@ __pthread_mutex_lock (mutex) else { /* We have to get the mutex. */ - lll_mutex_lock (mutex->__data.__lock); + LLL_MUTEX_LOCK (mutex->__data.__lock); /* Record the ownership. */ mutex->__data.__owner = id; @@ -66,7 +71,7 @@ __pthread_mutex_lock (mutex) case PTHREAD_MUTEX_TIMED_NP: case PTHREAD_MUTEX_ADAPTIVE_NP: /* Normal mutex. */ - lll_mutex_lock (mutex->__data.__lock); + LLL_MUTEX_LOCK (mutex->__data.__lock); /* Record the ownership. */ mutex->__data.__owner = id; break; @@ -74,5 +79,7 @@ __pthread_mutex_lock (mutex) return 0; } +#ifndef __pthread_mutex_lock strong_alias (__pthread_mutex_lock, pthread_mutex_lock) strong_alias (__pthread_mutex_lock, __pthread_mutex_lock_internal) +#endif |