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. --- string/string.h | 9 --------- 1 file changed, 9 deletions(-) (limited to 'string/string.h') diff --git a/string/string.h b/string/string.h index dd71072e76..4a49e457b8 100644 --- a/string/string.h +++ b/string/string.h @@ -108,13 +108,9 @@ extern size_t strxfrm (char *__restrict __dest, # include /* Compare the collated forms of S1 and S2 using rules from L. */ -extern int __strcoll_l (__const char *__s1, __const char *__s2, __locale_t __l) - __THROW __attribute_pure__; extern int strcoll_l (__const char *__s1, __const char *__s2, __locale_t __l) __THROW __attribute_pure__; /* Put a transformation of SRC into no more than N bytes of DEST. */ -extern size_t __strxfrm_l (char *__dest, __const char *__src, size_t __n, - __locale_t __l) __THROW; extern size_t strxfrm_l (char *__dest, __const char *__src, size_t __n, __locale_t __l) __THROW; #endif @@ -284,14 +280,9 @@ extern int strncasecmp (__const char *__s1, __const char *__s2, size_t __n) #ifdef __USE_GNU /* Again versions of a few functions which use the given locale instead of the global one. */ -extern int __strcasecmp_l (__const char *__s1, __const char *__s2, - __locale_t __loc) __THROW __attribute_pure__; extern int strcasecmp_l (__const char *__s1, __const char *__s2, __locale_t __loc) __THROW __attribute_pure__; -extern int __strncasecmp_l (__const char *__s1, __const char *__s2, - size_t __n, __locale_t __loc) - __THROW __attribute_pure__; extern int strncasecmp_l (__const char *__s1, __const char *__s2, size_t __n, __locale_t __loc) __THROW __attribute_pure__; -- cgit v1.2.3