about summary refs log tree commit diff
path: root/nptl
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-09-24 17:14:11 +0000
committerUlrich Drepper <drepper@redhat.com>2006-09-24 17:14:11 +0000
commit457b559e2ec7bd66c6da9e99d27f0d1723da4874 (patch)
tree7cef3d8309f8ce3b683daeed319918a25ea03ce0 /nptl
parent4a132246b1a34c6fe5d777a810e332236977e66a (diff)
downloadglibc-457b559e2ec7bd66c6da9e99d27f0d1723da4874.tar.gz
glibc-457b559e2ec7bd66c6da9e99d27f0d1723da4874.tar.xz
glibc-457b559e2ec7bd66c6da9e99d27f0d1723da4874.zip
* sysdeps/posix/getaddrinfo.c (rfc3484_sort): Implement rule 4,
	home addresses.
	* sysdeps/unix/sysv/linux/check_pf.c (make_request): Recognize
	IFA_F_HOMEADDRESS flag for interfaces.
	* include/ifaddrs.h (struct in6addrinfo): Define
	in6ai_homeaddress.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog6
-rw-r--r--nptl/descr.h2
2 files changed, 7 insertions, 1 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 94618d9099..f96101aa9e 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-24  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #3251]
+	* descr.h (ENQUEUE_MUTEX_BOTH): Add cast to avoid warning.
+	Patch by Petr Baudis.
+
 2006-09-18  Jakub Jelinek  <jakub@redhat.com>
 
 	* tst-kill4.c (do_test): Explicitly set tf thread's stack size.
diff --git a/nptl/descr.h b/nptl/descr.h
index b9b9ed7b98..321ce85085 100644
--- a/nptl/descr.h
+++ b/nptl/descr.h
@@ -201,7 +201,7 @@ struct pthread
     mutex->__data.__list.__next						      \
       = THREAD_GETMEM (THREAD_SELF, robust_list.__next);		      \
     THREAD_SETMEM (THREAD_SELF, robust_list.__next,			      \
-		   ((uintptr_t) &mutex->__data.__list) | val);		      \
+		   (void *) (((uintptr_t) &mutex->__data.__list) | val));     \
   } while (0)
 # define DEQUEUE_MUTEX(mutex) \
   do {									      \