From df9629171c45a83e14ff8319b4d0837ceee22d3f Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 13 Aug 2002 00:24:58 +0000 Subject: * include/unistd.h (seteuid, setegid): Add libc_hidden_proto. * sysdeps/generic/seteuid.c (seteuid): Add libc_hidden_def. * sysdeps/generic/setegid.c (setegid): Likewise. * sysdeps/mach/hurd/seteuid.c (seteuid): Likewise. * sysdeps/mach/hurd/setegid.c (setegid): Likewise. * sysdeps/unix/bsd/seteuid.c (seteuid): Likewise. * sysdeps/unix/bsd/setegid.c (setegid): Likewise. * sysdeps/unix/sysv/aix/seteuid.c (seteuid): Likewise. * sysdeps/unix/sysv/aix/setegid.c (setegid): Likewise. * sysdeps/unix/sysv/linux/i386/setegid.c (setegid): Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/seteuid.c (seteuid): Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/setegid.c (setegid): Likewise. * sysdeps/unix/sysv/linux/seteuid.c (seteuid): Likewise. * sysdeps/unix/sysv/linux/setegid.c (setegid): Likewise. * sysdeps/unix/sysv/linux/i386/seteuid.c (seteuid): Likewise. Remove fallback if __ASSUME_SETRESUID_SYSCALL. * include/sys/stat.h (__fxstat_internal, __fxstat64_internal, __lxstat_internal, __lxstat64_internal): Remove. (__fxstat, __fxstat64, __lxstat, __lxstat64, __xstat, __xstat64): Add hidden_proto. * sysdeps/generic/fxstat.c (__fxstat): Add hidden_def. Remove INTDEF where present, remove #undef at the beginning. * sysdeps/generic/fxstat64.c (__fxstat64): Likewise. * sysdeps/generic/lxstat.c (__lxstat): Likewise. * sysdeps/generic/lxstat64.c (__lxstat64): Likewise. * sysdeps/generic/xstat.c (__xstat): Likewise. * sysdeps/generic/xstat64.c (__xstat64): Likewise. * sysdeps/mach/hurd/dl-sysdep.c (__xstat64, __fxstat64): Likewise. * sysdeps/mach/hurd/fxstat.c (__fxstat): Likewise. * sysdeps/mach/hurd/fxstat64.c (__fxstat64): Likewise. * sysdeps/mach/hurd/lxstat.c (__lxstat): Likewise. * sysdeps/mach/hurd/lxstat64.c (__lxstat64): Likewise. * sysdeps/mach/hurd/xstat.c (__xstat): Likewise. * sysdeps/mach/hurd/xstat64.c (__xstat64): Likewise. * sysdeps/unix/fxstat.c (__fxstat): Likewise. * sysdeps/unix/common/lxstat.c (__lxstat): Likewise. * sysdeps/unix/sysv/aix/fxstat.c (__fxstat): Likewise. * sysdeps/unix/sysv/aix/fxstat64.c (__fxstat64): Likewise. * sysdeps/unix/sysv/aix/lxstat.c (__lxstat): Likewise. * sysdeps/unix/sysv/aix/lxstat64.c (__lxstat64): Likewise. * sysdeps/unix/sysv/aix/xstat.c (__xstat): Likewise. * sysdeps/unix/sysv/aix/xstat64.c (__xstat64): Likewise. * sysdeps/unix/sysv/linux/ia64/fxstat.c (__fxstat): Likewise. * sysdeps/unix/sysv/linux/ia64/lxstat.c (__lxstat): Likewise. * sysdeps/unix/sysv/linux/ia64/xstat.c (__xstat): Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/fxstat.c (__fxstat): Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/lxstat.c (__lxstat): Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/xstat.c (__xstat): Likewise. * sysdeps/unix/sysv/linux/i386/fxstat.c (__fxstat): Likewise. * sysdeps/unix/sysv/linux/i386/lxstat.c (__lxstat): Likewise. * sysdeps/unix/sysv/linux/i386/xstat.c (__xstat): Likewise. * sysdeps/unix/sysv/linux/xstat.c (__xstat): Likewise. * sysdeps/unix/sysv/linux/xstat64.c (__xstat64): Likewise. * sysdeps/unix/sysv/linux/fxstat.c (__fxstat): Likewise. * sysdeps/unix/sysv/linux/fxstat64.c (__fxstat64): Likewise. * sysdeps/unix/sysv/linux/lxstat.c (__lxstat): Likewise. * sysdeps/unix/sysv/linux/lxstat64.c (__lxstat64): Likewise. * sysdeps/unix/xstat.c (__xstat): Likewise. * include/sys/statvfs.h (statvfs, fstatvfs): Add libc_hidden_proto. * sysdeps/generic/statvfs.c (statvfs): Add libc_hidden_def. * sysdeps/generic/fstatvfs.c (fstatvfs): Likewise. * sysdeps/mach/hurd/statvfs.c (statvfs): Likewise. * sysdeps/mach/hurd/fstatvfs.c (fstatvfs): Likewise. * sysdeps/unix/sysv/linux/statvfs.c (statvfs): Likewise. * sysdeps/unix/sysv/linux/fstatvfs.c (fstatvfs): Likewise. * include/unistd.h (tcgetpgrp): Add libc_hidden_proto. * include/termios.h (tcsetattr, cfsetispeed, cfsetospeed): Likewise. * sysdeps/generic/tcgetpgrp.c (tcgetpgrp): Add libc_hidden_def. * sysdeps/generic/tcsetattr.c (tcsetattr): Likewise. * sysdeps/generic/speed.c (cfsetispeed, cfsetospeed): Likewise. * sysdeps/unix/bsd/bsd4.4/tcsetattr.c (tcgetpgrp): Likewise. * sysdeps/unix/bsd/sun/sunos4/tcsetattr.c (tcsetattr): Likewise. * sysdeps/unix/bsd/sun/sunos4/speed.c (cfsetispeed, cfsetospeed): Likewise. * sysdeps/unix/bsd/tcgetpgrp.c (tcgetpgrp): Likewise. * sysdeps/unix/bsd/tcsetattr.c (tcsetattr): Likewise. * sysdeps/unix/sysv/aix/tcsetattr.c (tcsetattr): Likewise. * sysdeps/unix/sysv/aix/speed.c (cfsetispeed, cfsetospeed): Likewise. * sysdeps/unix/sysv/linux/tcsetattr.c (tcsetattr): Likewise. * sysdeps/unix/sysv/linux/speed.c (cfsetispeed, cfsetospeed): Likewise. * sysdeps/unix/sysv/tcgetpgrp.c (tcgetpgrp): Likewise. * sysdeps/unix/sysv/tcsetattr.c (tcsetattr): Likewise. * include/string.h (strcoll): Add libc_hidden_proto. * string/strcoll.c (strcoll): Add libc_hidden_def. * misc/err.c (vwarn): Fix pasto in libc_hidden_def. --- include/sys/stat.h | 37 +++++++++++-------------------------- 1 file changed, 11 insertions(+), 26 deletions(-) (limited to 'include/sys/stat.h') diff --git a/include/sys/stat.h b/include/sys/stat.h index 6dcf0d8e3a..2e2566d9ef 100644 --- a/include/sys/stat.h +++ b/include/sys/stat.h @@ -11,14 +11,14 @@ extern __mode_t __umask (__mode_t __mask); extern int __mkdir (__const char *__path, __mode_t __mode); extern int __mknod (__const char *__path, __mode_t __mode, __dev_t __dev); -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; +#if !defined NOT_IN_libc || defined IS_IN_rtld +hidden_proto (__fxstat) +hidden_proto (__fxstat64) +hidden_proto (__lxstat) +hidden_proto (__lxstat64) +hidden_proto (__xstat) +hidden_proto (__xstat64) +#endif extern __inline__ int __stat (__const char *__path, struct stat *__statbuf) { return __xstat (_STAT_VER, __path, __statbuf); @@ -41,22 +41,7 @@ extern __inline__ int __mknod (__const char *__path, __mode_t __mode, #define __lstat(fname, buf) __lxstat (_STAT_VER, fname, buf) #define lstat64(fname, buf) __lxstat64 (_STAT_VER, fname, buf) #define stat64(fname, buf) __xstat64 (_STAT_VER, fname, buf) -#ifndef NOT_IN_libc -# define fstat64(fd, buf) INTUSE(__fxstat64) (_STAT_VER, fd, buf) -# define fstat(fd, buf) INTUSE(__fxstat) (_STAT_VER, fd, buf) -# define __fstat(fd, buf) INTUSE(__fxstat) (_STAT_VER, fd, buf) - -# define __fxstat(ver, fd, buf) INTUSE(__fxstat) (ver, fd, buf) -# ifndef __fxstat64 -# define __fxstat64(ver, fd, buf) INTUSE(__fxstat64) (ver, fd, buf) -# endif -# define __lxstat(ver, name, buf) INTUSE(__lxstat) (ver, name, buf) -# ifndef __lxstat64 -# define __lxstat64(ver, name, buf) INTUSE(__lxstat64) (ver, name, buf) -# endif -#else -# define fstat64(fd, buf) __fxstat64 (_STAT_VER, fd, buf) -# define fstat(fd, buf) __fxstat (_STAT_VER, fd, buf) -# define __fstat(fd, buf) __fxstat (_STAT_VER, fd, buf) -#endif +#define fstat64(fd, buf) __fxstat64 (_STAT_VER, fd, buf) +#define fstat(fd, buf) __fxstat (_STAT_VER, fd, buf) +#define __fstat(fd, buf) __fxstat (_STAT_VER, fd, buf) #endif -- cgit 1.4.1