From 0ecb606cb6cf65de1d9fc8a919bceb4be476c602 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 12 Jul 2007 18:26:36 +0000 Subject: 2.5-18.1 --- wctype/wcfuncs.c | 35 +++++++++++++++++++---------------- wctype/wcfuncs_l.c | 35 +++++++++++++++++++---------------- wctype/wctype.h | 3 +-- 3 files changed, 39 insertions(+), 34 deletions(-) (limited to 'wctype') 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 #include #include @@ -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 diff --git a/wctype/wcfuncs_l.c b/wctype/wcfuncs_l.c index c10af76102..d38acefd42 100644 --- a/wctype/wcfuncs_l.c +++ b/wctype/wcfuncs_l.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996,1997,2000,2001,2002,2004 Free Software Foundation, Inc. +/* Copyright (C) 1996,1997,2000-2002,2004,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 #include #include #include @@ -27,29 +28,31 @@ /* Provide real-function versions of all the wctype macros. */ #define func(name, type) \ - int __##name (wint_t wc, __locale_t locale) \ + int __isw##name (wint_t wc, __locale_t locale) \ { \ + if (isascii (wc)) \ + return is##name ((int) wc, locale); \ size_t i = locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_CLASS_OFFSET)].word + type; \ const char *desc = locale->__locales[LC_CTYPE]->values[i].string; \ return wctype_table_lookup (desc, wc); \ } \ - libc_hidden_def (__##name) \ - weak_alias (__##name, name) + libc_hidden_def (__isw##name) \ + weak_alias (__isw##name, isw##name) -func (iswalnum_l, __ISwalnum) -func (iswalpha_l, __ISwalpha) -func (iswblank_l, __ISwblank) -func (iswcntrl_l, __ISwcntrl) +func (alnum_l, __ISwalnum) +func (alpha_l, __ISwalpha) +func (blank_l, __ISwblank) +func (cntrl_l, __ISwcntrl) #undef iswdigit_l #undef __iswdigit_l -func (iswdigit_l, __ISwdigit) -func (iswlower_l, __ISwlower) -func (iswgraph_l, __ISwgraph) -func (iswprint_l, __ISwprint) -func (iswpunct_l, __ISwpunct) -func (iswspace_l, __ISwspace) -func (iswupper_l, __ISwupper) -func (iswxdigit_l, __ISwxdigit) +func (digit_l, __ISwdigit) +func (lower_l, __ISwlower) +func (graph_l, __ISwgraph) +func (print_l, __ISwprint) +func (punct_l, __ISwpunct) +func (space_l, __ISwspace) +func (upper_l, __ISwupper) +func (xdigit_l, __ISwxdigit) wint_t (__towlower_l) (wint_t wc, __locale_t locale) diff --git a/wctype/wctype.h b/wctype/wctype.h index f5519aa4eb..5bfe43895c 100644 --- a/wctype/wctype.h +++ b/wctype/wctype.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1996,97,98,99,2000,01,02 Free Software Foundation, Inc. +/* Copyright (C) 1996-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 @@ -44,7 +44,6 @@ typedef unsigned int wint_t; # ifdef __USE_ISOC99 __USING_NAMESPACE_C99(wint_t) # endif -__END_NAMESPACE_C99 # endif /* Constant expression of type `wint_t' whose value does not correspond -- cgit v1.2.3-65-gdbad