* 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.

6 files changed, 47 insertions, 0 deletions

diff --git a/include/langinfo.h b/include/langinfo.h
index 82ff070c89..8f93671658 100644
--- a/include/langinfo.h
+++ b/include/langinfo.h
@@ -4,4 +4,6 @@
 
 libc_hidden_proto (nl_langinfo)
 
+extern __typeof (nl_langinfo_l) __nl_langinfo_l;
+
 #endif
diff --git a/include/stdlib.h b/include/stdlib.h
index 7a98943725..6b17f35ec6 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -10,6 +10,14 @@
 /* Now define the internal interfaces.  */
 #ifndef __Need_M_And_C
 
+extern __typeof (strtol_l) __strtol_l;
+extern __typeof (strtoul_l) __strtoul_l;
+extern __typeof (strtoll_l) __strtoll_l;
+extern __typeof (strtoull_l) __strtoull_l;
+extern __typeof (strtod_l) __strtod_l;
+extern __typeof (strtof_l) __strtof_l;
+extern __typeof (strtold_l) __strtold_l;
+
 libc_hidden_proto (exit)
 libc_hidden_proto (abort)
 libc_hidden_proto (getenv)
diff --git a/include/string.h b/include/string.h
index c1df7acb93..6d9e4d3561 100644
--- a/include/string.h
+++ b/include/string.h
@@ -48,6 +48,11 @@ extern char *__strerror_r (int __errnum, char *__buf, size_t __buflen);
    above are defined as macros in the headers.  */
 #include <string/string.h>
 
+extern __typeof (strcoll_l) __strcoll_l;
+extern __typeof (strxfrm_l) __strxfrm_l;
+extern __typeof (strcasecmp_l) __strcasecmp_l;
+extern __typeof (strncasecmp_l) __strncasecmp_l;
+
 /* Alternative version which doesn't pollute glibc's namespace.  */
 #undef strndupa
 #define strndupa(s, n)							      \
diff --git a/include/time.h b/include/time.h
index 3b63b3dc9c..b57b7be1b4 100644
--- a/include/time.h
+++ b/include/time.h
@@ -4,6 +4,9 @@
 #else
 # include <time/time.h>
 
+extern __typeof (strftime_l) __strftime_l;
+extern __typeof (strptime_l) __strptime_l;
+
 libc_hidden_proto (time)
 libc_hidden_proto (asctime)
 libc_hidden_proto (mktime)
diff --git a/include/wchar.h b/include/wchar.h
index 7d3de19421..32afcbb6bb 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -3,6 +3,20 @@
 
 # ifdef _WCHAR_H
 
+extern __typeof (wcscasecmp_l) __wcscasecmp_l;
+extern __typeof (wcsncasecmp_l) __wcsncasecmp_l;
+extern __typeof (wcscoll_l) __wcscoll_l;
+extern __typeof (wcsxfrm_l) __wcsxfrm_l;
+extern __typeof (wcstol_l) __wcstol_l;
+extern __typeof (wcstoul_l) __wcstoul_l;
+extern __typeof (wcstoll_l) __wcstoll_l;
+extern __typeof (wcstoull_l) __wcstoull_l;
+extern __typeof (wcstod_l) __wcstod_l;
+extern __typeof (wcstof_l) __wcstof_l;
+extern __typeof (wcstold_l) __wcstold_l;
+extern __typeof (wcsftime_l) __wcsftime_l;
+
+
 libc_hidden_proto (__wcstof_internal)
 libc_hidden_proto (__wcstod_internal)
 libc_hidden_proto (__wcstold_internal)
diff --git a/include/wctype.h b/include/wctype.h
index d094d624c5..9382f32ea8 100644
--- a/include/wctype.h
+++ b/include/wctype.h
@@ -49,6 +49,21 @@ extern int __iswctype_internal (wint_t __wc, wctype_t __desc) attribute_hidden;
 extern wctype_t __wctype (__const char *__property);
 extern wint_t __towctrans (wint_t __wc, wctrans_t __desc);
 
+extern __typeof (iswalnum_l) __iswalnum_l;
+extern __typeof (iswalpha_l) __iswalpha_l;
+extern __typeof (iswblank_l) __iswblank_l;
+extern __typeof (iswcntrl_l) __iswcntrl_l;
+extern __typeof (iswdigit_l) __iswdigit_l;
+extern __typeof (iswlower_l) __iswlower_l;
+extern __typeof (iswgraph_l) __iswgraph_l;
+extern __typeof (iswprint_l) __iswprint_l;
+extern __typeof (iswpunct_l) __iswpunct_l;
+extern __typeof (iswspace_l) __iswspace_l;
+extern __typeof (iswupper_l) __iswupper_l;
+extern __typeof (iswxdigit_l) __iswxdigit_l;
+extern __typeof (towlower_l) __towlower_l;
+extern __typeof (towupper_l) __towupper_l;
+
 libc_hidden_proto (__iswctype)
 libc_hidden_proto (__iswalnum_l)
 libc_hidden_proto (__iswalpha_l)