diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2002-04-14 20:15:40 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2002-04-14 20:15:40 +0000 |
| commit | 08f600749ecfeedfcd70c4dd8d0a9fa6c4380a1c (patch) | |
| tree | b6f1e16464e572ea28deb01a7db8d6850d64b8b3 /wctype | |
| parent | f83af095b6fc49de3914f4426202171341783277 (diff) | |
| download | glibc-08f600749ecfeedfcd70c4dd8d0a9fa6c4380a1c.tar.gz glibc-08f600749ecfeedfcd70c4dd8d0a9fa6c4380a1c.tar.xz glibc-08f600749ecfeedfcd70c4dd8d0a9fa6c4380a1c.zip | |
Update.
* include/sys/socket.h: Declare __libc_sa_len_internal and define SA_LEN macro to use it if not NOT_IN_libc. * sysdeps/unix/sysv/linux/sa_len.c: Use INTDEF for __libc_sa_len. * include/fcntl.h: Declare __open_internal and define __open and __libc_open macros if not NOT_IN_libc. * sysdeps/generic/open.c: Use INTDEF for __open. * sysdeps/mach/hurd/open.c: Likewise. * sysdeps/unix/sysv/aix/open.c: Likewise. * sysdeps/unix/syscalls.list: Add __open_internal alias. * sysdeps/generic/check_fds.c: Make sure newly opened file descriptor has correct number. * include/fcntl.h: Define __libc_fcntl macro if not NOT_IN_libc. * sysdeps/mach/hurd/fcntl.c: Undefine __libc_fcntl as well. * sysdeps/unix/sysv/aix/fcntl.c: Likewise. * sysdeps/unix/sysv/linux/i386/fcntl.c: Likewise. * include/wctype.h: Declare __iswalpha_l_internal, __iswdigit_l_internal, __iswspace_l_internal, __iswxdigit_l_internal, and __iswctype_internal. Define __iswalpha_l, __iswctype, __iswdigit_l, __iswspace_l, and __iswxdigit_l macros if not NOT_IN_libc. * wctype/iswctype.c: Use INTDEF for __iswctype. * wctype/wcfuncs_l.c: Use INTDEF for all __iswXXX_l.
Diffstat (limited to 'wctype')
| -rw-r--r-- | wctype/iswctype.c | 4 | ||||
| -rw-r--r-- | wctype/wcfuncs_l.c | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/wctype/iswctype.c b/wctype/iswctype.c index 68db36b603..9a13861a8b 100644 --- a/wctype/iswctype.c +++ b/wctype/iswctype.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1996, 2000, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>. @@ -22,6 +22,7 @@ #include "wchar-lookup.h" +#undef __iswctype int __iswctype (wint_t wc, wctype_t desc) @@ -33,4 +34,5 @@ __iswctype (wint_t wc, wctype_t desc) return wctype_table_lookup ((const char *) desc, wc); } +INTDEF(__iswctype) weak_alias (__iswctype, iswctype) diff --git a/wctype/wcfuncs_l.c b/wctype/wcfuncs_l.c index a6fd3111b8..ff85b9814c 100644 --- a/wctype/wcfuncs_l.c +++ b/wctype/wcfuncs_l.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 2000, 2001, 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 @@ -24,6 +24,11 @@ #define USE_IN_EXTENDED_LOCALE_MODEL #include "wchar-lookup.h" +#undef __iswalpha_l +#undef __iswdigit_l +#undef __iswspace_l +#undef __iswxdigit_l + /* Provide real-function versions of all the wctype macros. */ #define func(name, type) \ @@ -32,7 +37,8 @@ size_t i = locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_CLASS_OFFSET)].word + type; \ const char *desc = locale->__locales[LC_CTYPE]->values[i].string; \ return wctype_table_lookup (desc, wc); \ - } + } \ + INTDEF(name) func (__iswalnum_l, __ISwalnum) func (__iswalpha_l, __ISwalpha) |