about summary refs log tree commit diff
path: root/nptl/pthread_mutex_trylock.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-06-18 22:22:57 +0000
committerUlrich Drepper <drepper@redhat.com>2007-06-18 22:22:57 +0000
commitae1ad3aebbc397212b4bb2eec92ff19f8c1f913a (patch)
treeb1ec4a328c2f5065d05e19ca024ed9be58dcf28c /nptl/pthread_mutex_trylock.c
parent3abee0b7f15aadf44f442ccdea30f0bdbe113293 (diff)
downloadglibc-ae1ad3aebbc397212b4bb2eec92ff19f8c1f913a.tar.gz
glibc-ae1ad3aebbc397212b4bb2eec92ff19f8c1f913a.tar.xz
glibc-ae1ad3aebbc397212b4bb2eec92ff19f8c1f913a.zip
[BZ #4647]
            Tomas Janousek  <tjanouse@redhat.com>
            Ulrich Drepper  <drepper@redhat.com>

	[BZ #4647]
	* resolv/res_send.c (send_dg): Remove socket_pf.  Use ipv6_unavail
	member in __res_state, only convaddr4to6 if nssocks[ns] is a PF_INET6
	socket.
	* resolv/resolv.h (__res_state): Add ipv6_unavail member.  Make
	unused member a bitmap.
	* resolv/res_init.c (__res_vinit): Reset ipv6_unavail if IPv6
	servers are configured.

2007-06-18  Jakub Jelinek  <jakub@redhat.com>
Diffstat (limited to 'nptl/pthread_mutex_trylock.c')
-rw-r--r--nptl/pthread_mutex_trylock.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/nptl/pthread_mutex_trylock.c b/nptl/pthread_mutex_trylock.c
index 9db904c60b..9a97a6cf81 100644
--- a/nptl/pthread_mutex_trylock.c
+++ b/nptl/pthread_mutex_trylock.c
@@ -31,7 +31,8 @@ __pthread_mutex_trylock (mutex)
   int oldval;
   pid_t id = THREAD_GETMEM (THREAD_SELF, tid);
 
-  switch (__builtin_expect (mutex->__data.__kind, PTHREAD_MUTEX_TIMED_NP))
+  switch (__builtin_expect (PTHREAD_MUTEX_TYPE (mutex),
+			    PTHREAD_MUTEX_TIMED_NP))
     {
       /* Recursive mutex.  */
     case PTHREAD_MUTEX_RECURSIVE_NP: