diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-07-12 18:26:36 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-07-12 18:26:36 +0000 |
| commit | 0ecb606cb6cf65de1d9fc8a919bceb4be476c602 (patch) | |
| tree | 2ea1f8305970753e4a657acb2ccc15ca3eec8e2c /wctype/wcfuncs.c | |
| parent | 7d58530341304d403a6626d7f7a1913165fe2f32 (diff) | |
| download | glibc-0ecb606cb6cf65de1d9fc8a919bceb4be476c602.tar.gz | |
2.5-18.1
Diffstat (limited to 'wctype/wcfuncs.c')
| -rw-r--r-- | wctype/wcfuncs.c | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/wctype/wcfuncs.c b/wctype/wcfuncs.c index 5d0e219fb2..88430a6062 100644 --- a/wctype/wcfuncs.c +++ b/wctype/wcfuncs.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996-2001, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1996-2001, 2002, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -16,6 +16,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#include <ctype.h> #include <wctype.h> #include <locale/localeinfo.h> @@ -24,45 +25,47 @@ /* Provide real-function versions of all the wctype macros. */ #define func(name, type) \ - extern int __##name (wint_t __wc); \ + extern int __isw##name (wint_t __wc); \ int \ - __##name (wint_t wc) \ + __isw##name (wint_t wc) \ { \ + if (isascii (wc)) \ + return is##name ((int) wc); \ size_t i = _NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_CLASS_OFFSET) + type; \ const char *desc = _NL_CURRENT (LC_CTYPE, i); \ return wctype_table_lookup (desc, wc); \ } \ - weak_alias (__##name, name) + weak_alias (__isw##name, isw##name) #undef iswalnum -func (iswalnum, __ISwalnum) +func (alnum, __ISwalnum) libc_hidden_weak (iswalnum) #undef iswalpha -func (iswalpha, __ISwalpha) +func (alpha, __ISwalpha) libc_hidden_weak (iswalpha) #undef iswblank -func (iswblank, __ISwblank) +func (blank, __ISwblank) #undef iswcntrl -func (iswcntrl, __ISwcntrl) +func (cntrl, __ISwcntrl) #undef iswdigit -func (iswdigit, __ISwdigit) +func (digit, __ISwdigit) libc_hidden_weak (iswdigit) #undef iswlower -func (iswlower, __ISwlower) +func (lower, __ISwlower) libc_hidden_weak (iswlower) #undef iswgraph -func (iswgraph, __ISwgraph) +func (graph, __ISwgraph) #undef iswprint -func (iswprint, __ISwprint) +func (print, __ISwprint) #undef iswpunct -func (iswpunct, __ISwpunct) +func (punct, __ISwpunct) #undef iswspace -func (iswspace, __ISwspace) +func (space, __ISwspace) libc_hidden_weak (iswspace) #undef iswupper -func (iswupper, __ISwupper) +func (upper, __ISwupper) #undef iswxdigit -func (iswxdigit, __ISwxdigit) +func (xdigit, __ISwxdigit) libc_hidden_weak (iswxdigit) #undef towlower |