diff options
author | Andreas Schwab <schwab@redhat.com> | 2010-01-11 10:31:49 +0100 |
---|---|---|
committer | Andreas Schwab <schwab@redhat.com> | 2010-01-11 10:31:49 +0100 |
commit | c14a0516dbea2e1b794f9a09a8ea182fbe0dc349 (patch) | |
tree | aea6ef619b1bb3ee704d5904f8209c33933c4822 /string/strcoll_l.c | |
parent | a5683508bcdcfcbe8e486cbcdcaa3830d9ab22e8 (diff) | |
parent | 33780b6d332af9d94216eff880734be7748c2269 (diff) |
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'string/strcoll_l.c')
-rw-r--r-- | string/strcoll_l.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/string/strcoll_l.c b/string/strcoll_l.c index 8bd84b10aa..d8d11392e3 100644 --- a/string/strcoll_l.c +++ b/string/strcoll_l.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995,96,97,2002, 2004, 2007 Free Software Foundation, Inc. +/* Copyright (C) 1995-1997,2002,2004,2007,2010 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Ulrich Drepper <drepper@gnu.org>, 1995. @@ -48,7 +48,7 @@ STRCOLL (s1, s2, l) const STRING_TYPE *s2; __locale_t l; { - struct locale_data *current = l->__locales[LC_COLLATE]; + struct __locale_data *current = l->__locales[LC_COLLATE]; uint_fast32_t nrules = current->values[_NL_ITEM_INDEX (_NL_COLLATE_NRULES)].word; /* We don't assign the following values right away since it might be unnecessary in case there are no rules. */ |