From d052233c6cc886f472736f3cd8f79e4ecf6e0c89 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 5 Sep 2006 15:33:13 +0000
Subject: [PATCH] * nscd/initgrcache.c (addinitgroupsX): Move any_success

	decl before first goto out.
---
 ChangeLog                       | 5 +++++
 localedata/ChangeLog            | 6 +++++-
 localedata/locales/or_IN        | 2 +-
 nptl/ChangeLog                  | 7 +++++++
 nptl/sysdeps/pthread/aio_misc.h | 2 +-
 nptl/sysdeps/pthread/gai_misc.h | 2 +-
 6 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0852a3c..2e878d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-05  Jakub Jelinek  <jakub@redhat.com>
+
+	* nscd/initgrcache.c (addinitgroupsX): Move any_success
+	decl before first goto out.
+
 2006-09-04  Jakub Jelinek  <jakub@redhat.com>
 
 	* Makerules (shlib.lds): If have-hash-style, put .hash section
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index df44366..936ae8b 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-05  Ulrich Drepper  <drepper@redhat.com>
+
+	* locales/or_IN (mon): Fix February string.
+
 2006-08-24  Ulrich Drepper  <drepper@redhat.com>
 
 	[BZ #2695]
@@ -20,7 +24,7 @@
 
 	[BZ #3034]
 	* locales/ml_IN (abmon): Fix June entry.
-	* locales/bn_IN: (abday): Fix Tuesday entry.
+	* locales/bn_IN (abday): Fix Tuesday entry.
 	(day): Likewise.
 	(abmon): Fix January and February entries.
 	(mon): Likewise.
diff --git a/localedata/locales/or_IN b/localedata/locales/or_IN
index 0312302..86754b2 100644
--- a/localedata/locales/or_IN
+++ b/localedata/locales/or_IN
@@ -641,7 +641,7 @@ abmon   "<U0031>";/
         "<U0031><U0031>";/
         "<U0031><U0032>"
 mon     "<U0B1C><U0B3E><U0B28><U0B41><U0B06><U0B30><U0B40>";/
-        "<U0B2B><U0B47><U0B2C><U0B4D><U0B30><U0B41><U0B5F><U0B3E><U0B30><U0B40>";/
+	"<U0B2B><U0B47><U0B2C><U0B43><U0B06><U0B30><U0B40>";/
         "<U0B2E><U0B3E><U0B30><U0B4D><U0B1A><U0B4D><U0B1A>";/
         "<U0B05><U0B2A><U0B4D><U0B30><U0B47><U0B32>";/
         "<U0B2E><U0B07>";/
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 3029360..e877428 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,10 @@
+2006-09-05  Jakub Jelinek  <jakub@redhat.com>
+            Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/pthread/gai_misc.h (GAI_MISC_NOTIFY): Don't decrement
+	counterp if it is already zero.
+	* sysdeps/pthread/aio_misc.h (AIO_MISC_NOTIFY): Likewise..
+
 2006-03-04  Jakub Jelinek  <jakub@redhat.com>
             Roland McGrath  <roland@redhat.com>
 
diff --git a/nptl/sysdeps/pthread/aio_misc.h b/nptl/sysdeps/pthread/aio_misc.h
index f285083..c5a11f4 100644
--- a/nptl/sysdeps/pthread/aio_misc.h
+++ b/nptl/sysdeps/pthread/aio_misc.h
@@ -29,7 +29,7 @@
 
 #define AIO_MISC_NOTIFY(waitlist) \
   do {									      \
-    if (--*waitlist->counterp == 0)					      \
+    if (*waitlist->counterp > 0 && --*waitlist->counterp == 0)		      \
       lll_futex_wake (waitlist->counterp, 1);				      \
   } while (0)
 
diff --git a/nptl/sysdeps/pthread/gai_misc.h b/nptl/sysdeps/pthread/gai_misc.h
index 1dc351a..9f6a73d 100644
--- a/nptl/sysdeps/pthread/gai_misc.h
+++ b/nptl/sysdeps/pthread/gai_misc.h
@@ -30,7 +30,7 @@
 
 #define GAI_MISC_NOTIFY(waitlist) \
   do {									      \
-    if (--*waitlist->counterp == 0)					      \
+    if (*waitlist->counterp > 0 && --*waitlist->counterp == 0)		      \
       lll_futex_wake (waitlist->counterp, 1);				      \
   } while (0)
 
-- 
2.7.4