diff options
| author |   Ulrich Drepper <drepper@redhat.com> | 1998-10-29 15:17:25 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-10-29 15:17:25 +0000 |
| commit | c5e340c71ba6f4563ca5fa245baa82b6363ddb2e (patch) | |
| tree | 3ff655dfee624df411e1f3ebc062181fc0f3f338 /linuxthreads/mutex.c | |
| parent | (__pthread_trylock): Define inline. (__pthread_lock): Add extra parameter to declaration. Declare using internal_function. (__pthread_unlock): Declare using internal_function. (diff) | |
| download | glibc-c5e340c71ba6f4563ca5fa245baa82b6363ddb2e.tar.xz glibc-c5e340c71ba6f4563ca5fa245baa82b6363ddb2e.zip | |
Update.
1998-10-29 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/ttyname_r.c (ttyname_r): Try reading
/prof/self/fd/FD first.
* sysdeps/unix/sysv/linux/ttyname.c (ttyname): Likewise.
* stdio-common/_itoa.h (_fitoa_word): New inline function. Write
formatted number starting at given position and return pointer to
following byte.
(_fitoa): Likewise, for long long.
Diffstat (limited to 'linuxthreads/mutex.c')
| -rw-r--r-- | linuxthreads/mutex.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linuxthreads/mutex.c b/linuxthreads/mutex.c index d3ef78cfbe..7e5271b5ea 100644 --- a/linuxthreads/mutex.c +++ b/linuxthreads/mutex.c @@ -81,7 +81,7 @@ int __pthread_mutex_lock(pthread_mutex_t * mutex) switch(mutex->__m_kind) { case PTHREAD_MUTEX_FAST_NP: - __pthread_lock(&mutex->__m_lock); + __pthread_lock(&mutex->__m_lock, NULL); return 0; case PTHREAD_MUTEX_RECURSIVE_NP: self = thread_self(); @@ -89,14 +89,14 @@ int __pthread_mutex_lock(pthread_mutex_t * mutex) mutex->__m_count++; return 0; } - __pthread_lock(&mutex->__m_lock); + __pthread_lock(&mutex->__m_lock, self); mutex->__m_owner = self; mutex->__m_count = 0; return 0; case PTHREAD_MUTEX_ERRORCHECK_NP: self = thread_self(); if (mutex->__m_owner == self) return EDEADLK; - __pthread_lock(&mutex->__m_lock); + __pthread_lock(&mutex->__m_lock, self); mutex->__m_owner = self; return 0; default: |