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. --- time/strftime.c | 2 +- time/time.h | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) (limited to 'time') diff --git a/time/strftime.c b/time/strftime.c index 8ae5985537..986124399b 100644 --- a/time/strftime.c +++ b/time/strftime.c @@ -1385,7 +1385,7 @@ my_strftime (s, maxsize, format, tp ut_argument LOCALE_PARAM) *p = L_('\0'); return i; } -#ifdef _LIBC +#if defined _LIBC && !defined USE_IN_EXTENDED_LOCALE_MODEL libc_hidden_def (my_strftime) #endif diff --git a/time/time.h b/time/time.h index dd7ce8dec5..e71ca7afcc 100644 --- a/time/time.h +++ b/time/time.h @@ -193,18 +193,11 @@ extern char *strptime (__const char *__restrict __s, the provided locale and not the global locale. */ # include -extern size_t __strftime_l (char *__restrict __s, size_t __maxsize, - __const char *__restrict __format, - __const struct tm *__restrict __tp, - __locale_t __loc) __THROW; extern size_t strftime_l (char *__restrict __s, size_t __maxsize, __const char *__restrict __format, __const struct tm *__restrict __tp, __locale_t __loc) __THROW; -extern char *__strptime_l (__const char *__restrict __s, - __const char *__restrict __fmt, struct tm *__tp, - __locale_t __loc) __THROW; extern char *strptime_l (__const char *__restrict __s, __const char *__restrict __fmt, struct tm *__tp, __locale_t __loc) __THROW; -- cgit v1.2.3