From d060e318a7e0f36690c9c88e23edf53708361250 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 14 Apr 2002 08:47:01 +0000 Subject: Update. 2002-04-14 Ulrich Drepper * include/sys/stat.h: Declare __fxstat_internal and __fxstat64_internal and define __fxstate and __fxstat64 macros if not NOT_IN_libc. Remove __lstat and __fstat inline functions. * sysdeps/generic/fxstat.c: Use INTDEF for __fxstat. * sysdeps/mach/hurd/fxstat.c: Likewise. * sysdeps/unix/fxstat.c: Likewise. * sysdeps/unix/sysv/aix/fxstat.c: Likewise. * sysdeps/unix/sysv/linux/fxstat.c: Likewise. * sysdeps/unix/sysv/linux/i386/fxstat.c: Likewise. * sysdeps/unix/sysv/linux/ia64/fxstat.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/fxstat.c: Likewise. * sysdeps/generic/fxstat64.c: Use INTDEF for __fxstat64. * sysdeps/mach/hurd/fxstat64.c: Likewise. * sysdeps/unix/sysv/aix/fxstat64.c: Likewise. * sysdeps/unix/sysv/linux/fxstat64.c: Likewise. * include/unistd.h: Declare __getpid_internal and define __getpid macro if not NOT_IN_libc. * sysdeps/mach/hurd/getpid.c: Use INTDEF for __getpid. * sysdeps/generic/getpid.c: Likewise. * sysdeps/unix/syscalls.list: Add __getpid_internal alias. * include/unistd.h: Declare __getpgid_internal and define __getpgid macro if not NOT_IN_libc. * sysdeps/generic/getpgid.c: Use INTDEF for __getpgid. * sysdeps/mach/hurd/getpgid.c: Likewise. * sysdeps/unix/sysv/aix/getpgid.c: Likewise. * sysdeps/unix/sysv/sysv4/__getpgid.c: Likewise. * sysdeps/unix/sysv/sysv4/getpgid.c: Likewise. * sysdeps/unix/sysv/linux/syscalls.list: Add _getpgid_internal alias. * include/unistd.h: Declare __getpagesize_internal and define __getpagesize macro if not NOT_IN_libc. * sysdeps/unix/sysv/linux/shmat.c: Include for __getpagesize. * sysdeps/generic/getpagesize.c: Use INTDEF for __getpagesize. * sysdeps/mach/getpagesize.c: Likewise. * sysdeps/posix/getpagesize.c: Likewise. * sysdeps/unix/getpagesize.c: Likewise. * sysdeps/unix/sysv/linux/getpagesize.c: Likewise. * sysdeps/unix/sysv/linux/ia64/getpagesize.c: Likewise. * sysdeps/unix/sysv/linux/m68k/getpagesize.c: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c: Likewise. --- include/sys/stat.h | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) (limited to 'include') diff --git a/include/sys/stat.h b/include/sys/stat.h index db0bd8f03d..bb89457e65 100644 --- a/include/sys/stat.h +++ b/include/sys/stat.h @@ -11,18 +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); +extern int __fxstat64_internal (int __ver, int __fildes, + struct stat64 *__stat_buf) ; extern __inline__ int __stat (__const char *__path, struct stat *__statbuf) { return __xstat (_STAT_VER, __path, __statbuf); } -extern __inline__ int __lstat (__const char *__path, struct stat *__statbuf) -{ - return __lxstat (_STAT_VER, __path, __statbuf); -} -extern __inline__ int __fstat (int __fd, struct stat *__statbuf) -{ - return __fxstat (_STAT_VER, __fd, __statbuf); -} extern __inline__ int __mknod (__const char *__path, __mode_t __mode, __dev_t __dev) { @@ -36,11 +32,20 @@ extern __inline__ int __mknod (__const char *__path, __mode_t __mode, We have to use macros but we cannot define them in the normal headers since on user level we must use real functions. */ #define stat(fname, buf) __xstat (_STAT_VER, fname, buf) -#define fstat(fd, buf) __fxstat (_STAT_VER, fd, buf) -#define __fstat(fd, buf) __fxstat (_STAT_VER, fd, buf) #define lstat(fname, buf) __lxstat (_STAT_VER, fname, buf) #define __lstat(fname, buf) __lxstat (_STAT_VER, fname, buf) -#define stat64(fname, buf) __xstat64 (_STAT_VER, fname, buf) -#define fstat64(fd, buf) __fxstat64 (_STAT_VER, fd, 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) +# define __fxstat64(ver, fd, buf) INTUSE(__fxstat64) (ver, fd, buf) +#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 #endif -- cgit 1.4.1