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 /include | |
| 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 'include')
| -rw-r--r-- | include/sys/stat.h | 6 | ||||
| -rw-r--r-- | include/unistd.h | 5 | ||||
| -rw-r--r-- | include/wchar.h | 11 |
3 files changed, 22 insertions, 0 deletions
diff --git a/include/sys/stat.h b/include/sys/stat.h index 16ae6c7125..dc9232df32 100644 --- a/include/sys/stat.h +++ b/include/sys/stat.h @@ -15,6 +15,10 @@ extern int __fxstat_internal (int __ver, int __fildes, struct stat *__stat_buf) attribute_hidden; extern int __fxstat64_internal (int __ver, int __fildes, struct stat64 *__stat_buf) attribute_hidden; +extern int __lxstat_internal (int __ver, __const char __file, + struct stat *__stat_buf) attribute_hidden; +extern int __lxstat64_internal (int __ver, __const char *__file, + struct stat64 *__stat_buf) attribute_hidden; extern __inline__ int __stat (__const char *__path, struct stat *__statbuf) { return __xstat (_STAT_VER, __path, __statbuf); @@ -43,6 +47,8 @@ extern __inline__ int __mknod (__const char *__path, __mode_t __mode, # define __fxstat(ver, fd, buf) INTUSE(__fxstat) (ver, fd, buf) # define __fxstat64(ver, fd, buf) INTUSE(__fxstat64) (ver, fd, buf) +# define __lxstat(ver, name, buf) INTUSE(__lxstat) (ver, name, buf) +# define __lxstat64(ver, name, buf) INTUSE(__lxstat64) (ver, name, buf) #else # define fstat64(fd, buf) __fxstat64 (_STAT_VER, fd, buf) # define fstat(fd, buf) __fxstat (_STAT_VER, fd, buf) diff --git a/include/unistd.h b/include/unistd.h index fe6b8b1a7c..aaf0be0532 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -89,6 +89,8 @@ extern int __close (int __fd); extern int __close_internal (int __fd) attribute_hidden; extern ssize_t __read (int __fd, void *__buf, size_t __nbytes); extern ssize_t __write (int __fd, __const void *__buf, size_t __n); +extern ssize_t __write_internal (int __fd, __const void *__buf, size_t __n) + attribute_hidden; extern __pid_t __fork (void); extern __pid_t __fork_internal (void) attribute_hidden; extern int __getpagesize (void) __attribute__ ((__const__)); @@ -122,6 +124,9 @@ extern void __libc_check_standard_fds (void); # define __getpagesize() INTUSE(__getpagesize) () # define __getpgid(pid) INTUSE(__getpgid) (pid) # define __getpid() INTUSE(__getpid) () +# ifdef SHARED +# define __libc_write(fd, buf, n) INTUSE(__write) (fd, buf, n) +# endif #endif #endif diff --git a/include/wchar.h b/include/wchar.h index 7ab4359ef2..c5bdf4d222 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -18,6 +18,12 @@ extern int __mbsinit (__const __mbstate_t *__ps); extern size_t __mbrtowc (wchar_t *__restrict __pwc, __const char *__restrict __s, size_t __n, __mbstate_t *__restrict __p); +extern size_t __mbrtowc_internal (wchar_t *__restrict __pwc, + __const char *__restrict __s, size_t __n, + __mbstate_t *__restrict __p) + attribute_hidden; +extern size_t __mbrlen_internal (__const char *__restrict __s, size_t __n, + mbstate_t *__restrict __ps) attribute_hidden; extern size_t __wcrtomb (char *__restrict __s, wchar_t __wc, __mbstate_t *__restrict __ps); extern size_t __mbsrtowcs (wchar_t *__restrict __dst, @@ -62,5 +68,10 @@ extern int __vfwprintf (__FILE *__restrict __s, __gnuc_va_list __arg) /* __attribute__ ((__format__ (__wprintf__, 3, 0))) */; +# ifndef NOT_IN_libc +# define __mbrlen(s, n, ps) INTUSE(__mbrlen) (s, n, ps) +# define __mbrtowc(pwc, s, n, p) INTUSE(__mbrtowc) (pwc, s, n, p) +# endif + # endif #endif |