diff options
Diffstat (limited to 'iconv/gconv_charset.h')
| -rw-r--r-- | iconv/gconv_charset.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/iconv/gconv_charset.h b/iconv/gconv_charset.h index 4a3db73..8882f43 100644 --- a/iconv/gconv_charset.h +++ b/iconv/gconv_charset.h @@ -1,5 +1,5 @@ /* Charset name normalization. - Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2001,2002,2003,2004,2005,2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 2001. @@ -29,9 +29,9 @@ strip (char *wp, const char *s) while (*s != '\0') { - if (__isalnum_l (*s, &_nl_C_locobj) - || *s == '_' || *s == '-' || *s == '.' || *s == ',') - *wp++ = __toupper_l (*s, &_nl_C_locobj); + if (__isalnum_l (*s, _nl_C_locobj_ptr) + || *s == '_' || *s == '-' || *s == '.' || *s == ',' || *s == ':') + *wp++ = __toupper_l (*s, _nl_C_locobj_ptr); else if (*s == '/') { if (++slash_count == 3) @@ -52,7 +52,7 @@ static inline char * __attribute__ ((unused, always_inline)) upstr (char *dst, const char *str) { char *cp = dst; - while ((*cp++ = __toupper_l (*str++, &_nl_C_locobj)) != '\0') + while ((*cp++ = __toupper_l (*str++, _nl_C_locobj_ptr)) != '\0') /* nothing */; return dst; } |