From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 28 Dec 2004 10:09:27 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/fedora-glibc-20050106T1443~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab4bc7134909bbb3a91c4b53caa30b8ecbda1611;p=thirdparty%2Fglibc.git

Update.

2004-12-28  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/generic/dl-tls.c (__tls_get_addr): Fix typo.
---

diff --git a/ChangeLog b/ChangeLog
index d310c221bf8..93a7eddcc53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-28  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/generic/dl-tls.c (__tls_get_addr): Fix typo.
+
 2004-12-27  Ulrich Drepper  <drepper@redhat.com>
 
 	* include/signal.h: Define __sigemptyset.
diff --git a/include/signal.h b/include/signal.h
index 6ceafe0c73f..dc1e0a12e5b 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -49,6 +49,7 @@ extern int __default_sigpause (int mask);
 extern int __xpg_sigpause (int sig);
 
 /* Simplified sigemptyset() implementation without the parameter checking.  */
+#undef __sigemptyset
 #define __sigemptyset(ss) (memset (ss, '\0', sizeof (sigset_t)), 0)
 
 
diff --git a/sysdeps/generic/dl-tls.c b/sysdeps/generic/dl-tls.c
index 3382e3493cf..2282dda9cc3 100644
--- a/sysdeps/generic/dl-tls.c
+++ b/sysdeps/generic/dl-tls.c
@@ -577,7 +577,7 @@ __tls_get_addr (GET_ADDR_ARGS)
 	    {
 	      size_t cnt;
 
-	      for (cnt = total = 0 ? 1 : 0; cnt < listp->len; ++cnt)
+	      for (cnt = total == 0 ? 1 : 0; cnt < listp->len; ++cnt)
 		{
 		  size_t gen = listp->slotinfo[cnt].gen;
 		  struct link_map *map;