summaryrefslogtreecommitdiff
path: root/ctype
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-08-27 23:36:31 +0000
committerRoland McGrath <roland@gnu.org>2002-08-27 23:36:31 +0000
commitda4cfe381c52e7be8158265d5d79abdc979cd8a1 (patch)
tree0472caf36abe321b7e2a06b188428e4d3b62d053 /ctype
parent60f20c19fb3f4fc7c4d383dcfb2b54e70906e818 (diff)
* 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.
Diffstat (limited to 'ctype')
-rw-r--r--ctype/ctype-extn.c3
-rw-r--r--ctype/ctype.h7
2 files changed, 5 insertions, 5 deletions
diff --git a/ctype/ctype-extn.c b/ctype/ctype-extn.c
index 764a5d34ef..4bab5a0298 100644
--- a/ctype/ctype-extn.c
+++ b/ctype/ctype-extn.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1997, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1997, 1999, 2000, 2002 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
@@ -59,3 +59,4 @@ __isblank_l (int c, __locale_t l)
{
return __isctype_l (c, _ISblank, l);
}
+weak_alias (__isblank_l, isblank_l)
diff --git a/ctype/ctype.h b/ctype/ctype.h
index c17aaf171c..4a8ce30d04 100644
--- a/ctype/ctype.h
+++ b/ctype/ctype.h
@@ -216,8 +216,7 @@ toupper (int __c) __THROW
((locale)->__ctype_b[(int) (c)] & (unsigned short int) type)
# define __exctype_l(name) \
- extern int name (int, __locale_t) __THROW; \
- extern int __##name (int, __locale_t) __THROW
+ extern int name (int, __locale_t) __THROW
/* The following names are all functions:
int isCHARACTERISTIC(int c, locale_t *locale);
@@ -291,8 +290,8 @@ extern int toupper_l (int __c, __locale_t __l) __THROW;
# define isblank_l(c,l) __isblank_l ((c), (l))
# if defined __USE_SVID || defined __USE_MISC || defined __USE_XOPEN
-# define isascii_l(c,l) __isascii ((c), (l))
-# define toascii_l(c,l) __toascii ((c), (l))
+# define isascii_l(c,l) __isascii_l ((c), (l))
+# define toascii_l(c,l) __toascii_l ((c), (l))
# endif
# endif /* Not __NO_CTYPE. */