diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-05-05 11:06:02 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-05-05 11:06:02 +0000 |
| commit | 9dffe5df04949a0dd0f37832415009bf84d882b6 (patch) | |
| tree | 5218a6b2ebaaa2dcd1c1e55e6858ccacda03397e /libc/locale | |
| parent | c46d4a9b60ba79c321ab9075f71751389808a15a (diff) | |
Merge changes between r13354 and r13697 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@13698 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/locale')
| -rw-r--r-- | libc/locale/programs/ld-collate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/locale/programs/ld-collate.c b/libc/locale/programs/ld-collate.c index e60f25a66..573572c11 100644 --- a/libc/locale/programs/ld-collate.c +++ b/libc/locale/programs/ld-collate.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-2003, 2005-2008, 2009 Free Software Foundation, Inc. +/* Copyright (C) 1995-2003, 2005-2008, 2009, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1995. @@ -2454,7 +2454,7 @@ collate_output (struct localedef_t *locale, const struct charmap_t *charmap, elem_table[idx * 2] = hash; elem_table[idx * 2 + 1] = obstack_object_size (&extrapool); - /* The the string itself including length. */ + /* The string itself including length. */ obstack_1grow (&extrapool, namelen); obstack_grow (&extrapool, runp->name, namelen); |