From da4cfe381c52e7be8158265d5d79abdc979cd8a1 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 27 Aug 2002 23:36:31 +0000 Subject: * ctype/ctype.h (isascii_l, toascii_l): Define to __*_l counterparts. * ctype/ctype-extn.c (isblank_l): Add weak alias. * sysdeps/generic/strtol_l.c (strtol_l): Likewise. * sysdeps/generic/strtoll_l.c (strtoll_l): Likewise. * sysdeps/generic/strtoul_l.c (strtoul_l): Likewise. * sysdeps/generic/strtoull_l.c (strtoull_l): Likewise. * wctype/iswctype_l.c (iswctype_l): Likewise. * time/strftime.c [USE_IN_EXTENDED_LOCALE_MODEL]: No libc_hidden_def. * ctype/ctype.h (__exctype_l): Don't declare __ name. * stdlib/stdlib.h: Don't declare __*_l names. * include/stdlib.h: Declare them here instead. * include/string.h: Don't declare __*_l names. * string/string.h: Declare them here instead. * time/time.h: Don't declare __*_l names. * include/time.h: Declare them here instead. * wcsmbs/wchar.h: Don't declare __*_l names. * include/wchar.h: Declare them here instead. * wctype/wctype.h: Declare iswalnum_l, not __iswalnum_l. Don't declare __*_l names. * include/wctype.h: Declare them here instead. * stdlib/monetary.h: Declare strfmon_l, not __strfmon_l. * stdlib/strfmon_l.c (strfmon_l): Define as weak alias. * locale/langinfo.h: Don't declare __nl_langinfo_l. * include/langinfo.h: Declare it here with __typeof. --- wctype/iswctype_l.c | 3 ++- wctype/wctype.h | 23 +---------------------- 2 files changed, 3 insertions(+), 23 deletions(-) (limited to 'wctype') diff --git a/wctype/iswctype_l.c b/wctype/iswctype_l.c index d3c4a4a7e9..fea94f1a14 100644 --- a/wctype/iswctype_l.c +++ b/wctype/iswctype_l.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 2000, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1996. @@ -34,3 +34,4 @@ __iswctype_l (wint_t wc, wctype_t desc, __locale_t locale) return wctype_table_lookup ((const char *) desc, wc); } +weak_alias (__iswctype_l, iswctype_l) diff --git a/wctype/wctype.h b/wctype/wctype.h index 1b5d76883b..cd7f0b89d2 100644 --- a/wctype/wctype.h +++ b/wctype/wctype.h @@ -300,80 +300,65 @@ extern wint_t towctrans (wint_t __wc, wctrans_t __desc) __THROW; /* Test for any wide character for which `iswalpha' or `iswdigit' is true. */ -extern int __iswalnum_l (wint_t __wc, __locale_t __locale) __THROW; +extern int iswalnum_l (wint_t __wc, __locale_t __locale) __THROW; /* Test for any wide character for which `iswupper' or 'iswlower' is true, or any wide character that is one of a locale-specific set of wide-characters for which none of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true. */ -extern int __iswalpha_l (wint_t __wc, __locale_t __locale) __THROW; extern int iswalpha_l (wint_t __wc, __locale_t __locale) __THROW; /* Test for any control wide character. */ -extern int __iswcntrl_l (wint_t __wc, __locale_t __locale) __THROW; extern int iswcntrl_l (wint_t __wc, __locale_t __locale) __THROW; /* Test for any wide character that corresponds to a decimal-digit character. */ -extern int __iswdigit_l (wint_t __wc, __locale_t __locale) __THROW; extern int iswdigit_l (wint_t __wc, __locale_t __locale) __THROW; /* Test for any wide character for which `iswprint' is true and `iswspace' is false. */ -extern int __iswgraph_l (wint_t __wc, __locale_t __locale) __THROW; extern int iswgraph_l (wint_t __wc, __locale_t __locale) __THROW; /* Test for any wide character that corresponds to a lowercase letter or is one of a locale-specific set of wide characters for which none of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true. */ -extern int __iswlower_l (wint_t __wc, __locale_t __locale) __THROW; extern int iswlower_l (wint_t __wc, __locale_t __locale) __THROW; /* Test for any printing wide character. */ -extern int __iswprint_l (wint_t __wc, __locale_t __locale) __THROW; extern int iswprint_l (wint_t __wc, __locale_t __locale) __THROW; /* Test for any printing wide character that is one of a locale-specific et of wide characters for which neither `iswspace' nor `iswalnum' is true. */ -extern int __iswpunct_l (wint_t __wc, __locale_t __locale) __THROW; extern int iswpunct_l (wint_t __wc, __locale_t __locale) __THROW; /* Test for any wide character that corresponds to a locale-specific set of wide characters for which none of `iswalnum', `iswgraph', or `iswpunct' is true. */ -extern int __iswspace_l (wint_t __wc, __locale_t __locale) __THROW; extern int iswspace_l (wint_t __wc, __locale_t __locale) __THROW; /* Test for any wide character that corresponds to an uppercase letter or is one of a locale-specific set of wide character for which none of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true. */ -extern int __iswupper_l (wint_t __wc, __locale_t __locale) __THROW; extern int iswupper_l (wint_t __wc, __locale_t __locale) __THROW; /* Test for any wide character that corresponds to a hexadecimal-digit character equivalent to that performed be the functions described in the previous subclause. */ -extern int __iswxdigit_l (wint_t __wc, __locale_t __locale) __THROW; extern int iswxdigit_l (wint_t __wc, __locale_t __locale) __THROW; /* Test for any wide character that corresponds to a standard blank wide character or a locale-specific set of wide characters for which `iswalnum' is false. */ -extern int __iswblank_l (wint_t __wc, __locale_t __locale) __THROW; extern int iswblank_l (wint_t __wc, __locale_t __locale) __THROW; /* Construct value that describes a class of wide characters identified by the string argument PROPERTY. */ -extern wctype_t __wctype_l (__const char *__property, __locale_t __locale) - __THROW; extern wctype_t wctype_l (__const char *__property, __locale_t __locale) __THROW; /* Determine whether the wide-character WC has the property described by DESC. */ -extern int __iswctype_l (wint_t __wc, wctype_t __desc, __locale_t __locale) - __THROW; extern int iswctype_l (wint_t __wc, wctype_t __desc, __locale_t __locale) __THROW; @@ -383,23 +368,17 @@ extern int iswctype_l (wint_t __wc, wctype_t __desc, __locale_t __locale) */ /* Converts an uppercase letter to the corresponding lowercase letter. */ -extern wint_t __towlower_l (wint_t __wc, __locale_t __locale) __THROW; extern wint_t towlower_l (wint_t __wc, __locale_t __locale) __THROW; /* Converts an lowercase letter to the corresponding uppercase letter. */ -extern wint_t __towupper_l (wint_t __wc, __locale_t __locale) __THROW; extern wint_t towupper_l (wint_t __wc, __locale_t __locale) __THROW; /* Construct value that describes a mapping between wide characters identified by the string argument PROPERTY. */ -extern wctrans_t __wctrans_l (__const char *__property, __locale_t __locale) - __THROW; extern wctrans_t wctrans_l (__const char *__property, __locale_t __locale) __THROW; /* Map the wide character WC using the mapping described by DESC. */ -extern wint_t __towctrans_l (wint_t __wc, wctrans_t __desc, - __locale_t __locale) __THROW; extern wint_t towctrans_l (wint_t __wc, wctrans_t __desc, __locale_t __locale) __THROW; -- cgit v1.2.3