diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2013-12-20 09:29:29 +0100 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2013-12-20 09:29:29 +0100 |
| commit | a65dd355fb80a05215e15ae97649de52aec885e3 (patch) | |
| tree | 81701bb0c6b648630f2bf1729a85d7f5eb49e67b /nptl/sysdeps/pthread/bits/libc-lock.h | |
| parent | 296a5732f94abe4d5699dc981e4ccfb950b48cee (diff) | |
| parent | b4578bab30f72cddd2cf38abfb39f9c8dc892249 (diff) | |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Diffstat (limited to 'nptl/sysdeps/pthread/bits/libc-lock.h')
| -rw-r--r-- | nptl/sysdeps/pthread/bits/libc-lock.h | 6 |
1 files changed, 3 insertions, 3 deletions
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 |