diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/bits/libc-lock.h | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 19152d604b..167131b898 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2013-09-27 Siddhesh Poyarekar <siddhesh@redhat.com> + + * nptl/sysdeps/pthread/bits/libc-lock.h [_LIBC && + (!NOT_IN_libc || IS_IN_libpthread)] + (__libc_lock_fini_recursive): Use the mutex member of the + argument. + (__libc_lock_trylock_recursive): Likewise. + (__libc_lock_unlock_recursive): Likewise. + 2013-09-27 Kaz Kojima <kkojima@rr.iij4u.or.jp> * sysdeps/sh/stackguard-macros.h: New file. diff --git a/nptl/sysdeps/pthread/bits/libc-lock.h b/nptl/sysdeps/pthread/bits/libc-lock.h index b46bca9261..0b95ab7404 100644 --- a/nptl/sysdeps/pthread/bits/libc-lock.h +++ b/nptl/sysdeps/pthread/bits/libc-lock.h @@ -87,7 +87,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t; # define __libc_lock_fini_recursive(NAME) ((void) 0) #else # define __libc_lock_fini_recursive(NAME) \ - __libc_maybe_call (__pthread_mutex_destroy, (&(NAME)), 0) + __libc_maybe_call (__pthread_mutex_destroy, (&(NAME).mutex), 0) #endif /* Lock the recursive named lock variable. */ @@ -129,7 +129,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t; }) #else # define __libc_lock_trylock_recursive(NAME) \ - __libc_maybe_call (__pthread_mutex_trylock, (&(NAME)), 0) + __libc_maybe_call (__pthread_mutex_trylock, (&(NAME).mutex), 0) #endif /* Unlock the recursive named lock variable. */ @@ -145,7 +145,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t; } while (0) #else # define __libc_lock_unlock_recursive(NAME) \ - __libc_maybe_call (__pthread_mutex_unlock, (&(NAME)), 0) + __libc_maybe_call (__pthread_mutex_unlock, (&(NAME).mutex), 0) #endif /* Note that for I/O cleanup handling we are using the old-style |