[Glibc-bsd-commits] r5967 - trunk/glibc-ports-2.23/fbtl/sysdeps/pthread

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2016-03-22 12:20:21 +0000 (Tue, 22 Mar 2016)
New Revision: 5967

Modified:
   trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/libc-lock.h
Log:
Merge from upstream:

commit c8886d0abff2b2b16870751fc2101d4f3744a406
Author: Siddhesh Poyarekar <siddhesh at redhat.com>
Date:   Fri Sep 27 07:59:26 2013 +0530

    Use the mutex member of the argumen in __libc_lock_*_recursive



Modified: trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/libc-lock.h
===================================================================
--- trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/libc-lock.h	2016-03-22 12:18:12 UTC (rev 5966)
+++ trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/libc-lock.h	2016-03-22 12:20:21 UTC (rev 5967)
@@ -82,7 +82,7 @@
 # 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.  */
@@ -124,7 +124,7 @@
   })
 #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.  */
@@ -140,7 +140,7 @@
   } 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