diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2002-04-15 05:35:10 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2002-04-15 05:35:10 +0000 |
| commit | fab656f5a776f09596b9e74f9a43f8300dd724c7 (patch) | |
| tree | 61d7caeba4f8543fe115b6055a8a91edc55d6df8 /wcsmbs | |
| parent | 08f600749ecfeedfcd70c4dd8d0a9fa6c4380a1c (diff) | |
| download | glibc-fab656f5a776f09596b9e74f9a43f8300dd724c7.tar.gz glibc-fab656f5a776f09596b9e74f9a43f8300dd724c7.tar.xz glibc-fab656f5a776f09596b9e74f9a43f8300dd724c7.zip | |
Update.
* include/sys/stat.h: Add prototypes for __lxstat_internal and __lxstat64_internal. Add macros __lxstat and __lxstat64 if not NOT_IN_libc. * sysdeps/generic/lxstat.c: Use INTDEF for __lxstat. * sysdeps/mach/hurd/lxstat.c: Likewise. * sysdeps/unix/common/lxstat.c: Likewise. * sysdeps/unix/sysv/aix/lxstat.c: Likewise. * sysdeps/unix/sysv/linux/lxstat.c: Likewise. * sysdeps/unix/sysv/linux/i386/lxstat.c: Likewise. * sysdeps/unix/sysv/linux/ia64/lxstat.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/lxstat.c: Likewise. * sysdeps/generic/lxstat64.c: Use INTDEF for __lxstat64. * sysdeps/mach/hurd/lxstat64.c: Likewise. * sysdeps/unix/sysv/aix/lxstat64.c: Likewise. * sysdeps/unix/sysv/linuxx/lxstat64.c: Likewise. * include/wchar.h: Declare __mbrtowc_internal and __mbrlen_internal prototypes. Add __mbrlen and __mbrtowc macros. * wcsmbs/mbrlen.c: Use INTDEF for __mbrlen. * wcsmbs/mbrtowc.c: Use INTDEF for __mbrtowc. * include/unistd.h: Add prototype for __write_internal and add __libc_write macro is SHARED. * sysdeps/generic/write.c: Use INTDEF for __write. * sysdeps/mach/hurd/write.c: Likewise. * sysdeps/unix/sysv/aix/write.c: Likewise. * sysdeps/unix/syscalls.list: Add __libc_write alias. * assert/assert.c: Replace STR_N_SIZE with something usable in macro arguments. * assert/assert-perr.c: Likewise.
Diffstat (limited to 'wcsmbs')
| -rw-r--r-- | wcsmbs/mbrlen.c | 4 | ||||
| -rw-r--r-- | wcsmbs/mbrtowc.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/wcsmbs/mbrlen.c b/wcsmbs/mbrlen.c index 52f92bb9dc..ff7f6628a5 100644 --- a/wcsmbs/mbrlen.c +++ b/wcsmbs/mbrlen.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu> @@ -19,6 +19,7 @@ #include <wchar.h> +#undef __mbrlen /* The mbrlen function has an internal shift state which gets used if the PS parameter is NULL. */ @@ -33,4 +34,5 @@ __mbrlen (s, n, ps) { return __mbrtowc (NULL, s, n, ps ?: &internal); } +INTDEF(__mbrlen) weak_alias (__mbrlen, mbrlen) diff --git a/wcsmbs/mbrtowc.c b/wcsmbs/mbrtowc.c index 965535fcd5..a2a31872c8 100644 --- a/wcsmbs/mbrtowc.c +++ b/wcsmbs/mbrtowc.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1996,1997,1998,1999,2000,2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1996. @@ -29,6 +29,8 @@ # define EILSEQ EINVAL #endif +#undef __mbrtowc + /* This is the private state used if PS is NULL. */ static mbstate_t state; @@ -104,4 +106,5 @@ __mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) return result; } +INTDEF(__mbrtowc) weak_alias (__mbrtowc, mbrtowc) |