summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-11-22 22:21:08 +0000
committerUlrich Drepper <drepper@redhat.com>2007-11-22 22:21:08 +0000
commit3a632674508a4c934c75e4f6052ed37f1bba07bc (patch)
tree377e80dda6f64eb8ebe4f40de208206b78f181b7
parent77f1e09a99848129f3b5e850e08ece84fe8ca542 (diff)
downloadglibc-3a632674508a4c934c75e4f6052ed37f1bba07bc.tar.gz
glibc-3a632674508a4c934c75e4f6052ed37f1bba07bc.tar.xz
glibc-3a632674508a4c934c75e4f6052ed37f1bba07bc.zip
* locale/programs/ld-collate.c (collate_read): Fix loop to match
	macro name.
-rw-r--r--ChangeLog5
-rw-r--r--locale/programs/ld-collate.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 19da08897b..33cfca34ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-22  Ulrich Drepper  <drepper@redhat.com>
+
+	* locale/programs/ld-collate.c (collate_read): Fix loop to match
+	macro name.
+
 2007-11-19  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/posix/getaddrinfo.c (defaults_scopes, scopes): New variables.
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index bf22a2c47b..227e764a6c 100644
--- a/locale/programs/ld-collate.c
+++ b/locale/programs/ld-collate.c
@@ -4008,6 +4008,8 @@ error while adding equivalent collating symbol"));
 			     arg->val.str.lenmb) == 0
 		    && curdef->str[arg->val.str.lenmb] == '\0')
 		  break;
+		else
+		  curdef = curdef->next;
 
 	      if ((nowtok == tok_ifdef && curdef != NULL)
 		  || (nowtok == tok_ifndef && curdef == NULL))