diff options
author | Andreas Jaeger <aj@suse.de> | 2002-12-31 13:24:35 +0000 |
---|---|---|
committer | Andreas Jaeger <aj@suse.de> | 2002-12-31 13:24:35 +0000 |
commit | d5f001d4e1cc7f39bfb39bc7efd685ce14a764a7 (patch) | |
tree | 0d8d8c8468c4801fba87e1c838bebcc0c73654c8 /sysdeps/unix/sysv/linux/s390 | |
parent | d1436edcb90d3987b50e483550c09a8e75ab0a88 (diff) | |
download | glibc-d5f001d4e1cc7f39bfb39bc7efd685ce14a764a7.tar glibc-d5f001d4e1cc7f39bfb39bc7efd685ce14a764a7.tar.gz glibc-d5f001d4e1cc7f39bfb39bc7efd685ce14a764a7.tar.bz2 glibc-d5f001d4e1cc7f39bfb39bc7efd685ce14a764a7.zip |
* sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h: Sync
with Linux kernel.
* sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/kernel_stat.h: Likewise.
* sysdeps/unix/sysv/linux/hppa/kernel_stat.h: Likewise.
* sysdeps/unix/sysv/linux/kernel_stat.h
(_HAVE_STAT_NSEC,_HAVE_STAT_NSEC64): New.
* sysdeps/unix/sysv/linux/xstatconv.c (xstat_conv): Readd
__unused[1-3] since they're needed by some platforms. Handle
_HAVE_STAT_NSEC and _HAVE_STAT_NSEC64.
* sysdeps/unix/sysv/linux/x86_64/bits/stat.h: Add nsec resolution
for structs stat and stat64.
* sysdeps/unix/sysv/linux/ia64/bits/stat.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/bits/stat.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/stat.h: Likewise.
* sysdeps/unix/sysv/linux/s390/bits/stat.h: Likewise.
Diffstat (limited to 'sysdeps/unix/sysv/linux/s390')
-rw-r--r-- | sysdeps/unix/sysv/linux/s390/bits/stat.h | 96 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-64/kernel_stat.h | 17 |
2 files changed, 85 insertions, 28 deletions
diff --git a/sysdeps/unix/sysv/linux/s390/bits/stat.h b/sysdeps/unix/sysv/linux/s390/bits/stat.h index 419a4151c1..7dd3bd89b4 100644 --- a/sysdeps/unix/sysv/linux/s390/bits/stat.h +++ b/sysdeps/unix/sysv/linux/s390/bits/stat.h @@ -56,12 +56,27 @@ struct stat int pad0; __dev_t st_rdev; /* Device number, if device. */ __off_t st_size; /* Size of file, in bytes. */ - __time_t st_atime; /* Time of last access. */ - long int __reserved0; /* Reserved for atime.nanoseconds. */ - __time_t st_mtime; /* Time of last modification. */ - long int __reserved1; /* Reserved for mtime.nanoseconds. */ - __time_t st_ctime; /* Time of last status change. */ - long int __reserved2; /* Reserved for ctime.nanoseconds. */ +#ifdef __USE_MISC + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the + identifier 'timespec' to appear in the <sys/stat.h> header. + Therefore we have to handle the use of this header in strictly + standard-compliant sources special. */ + struct timespec st_atim; /* Time of last access. */ + struct timespec st_mtim; /* Time of last modification. */ + struct timespec st_ctim; /* Time of last status change. */ +# define st_atime st_atim.tv_sec /* Backward compatibility. */ +# define st_mtime st_mtim.tv_sec +# define st_ctime st_ctim.tv_sec +#else + __time_t st_atime; /* Time of last access. */ + unsigned long int st_atimensec; /* Nscecs of last access. */ + __time_t st_mtime; /* Time of last modification. */ + unsigned long int st_mtimensec; /* Nsecs of last modification. */ + __time_t st_ctime; /* Time of last status change. */ + unsigned long int st_ctimensec; /* Nsecs of last status change. */ +#endif __blksize_t st_blksize; /* Optimal block size for I/O. */ __blkcnt_t st_blocks; /* Nr. 512-byte blocks allocated. */ long int __unused[3]; @@ -94,12 +109,27 @@ struct stat # else __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ # endif +#ifdef __USE_MISC + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the + identifier 'timespec' to appear in the <sys/stat.h> header. + Therefore we have to handle the use of this header in strictly + standard-compliant sources special. */ + struct timespec st_atim; /* Time of last access. */ + struct timespec st_mtim; /* Time of last modification. */ + struct timespec st_ctim; /* Time of last status change. */ +# define st_atime st_atim.tv_sec /* Backward compatibility. */ +# define st_mtime st_mtim.tv_sec +# define st_ctime st_ctim.tv_sec +#else __time_t st_atime; /* Time of last access. */ - unsigned long int __unused1; + unsigned long int st_atimensec; /* Nscecs of last access. */ __time_t st_mtime; /* Time of last modification. */ - unsigned long int __unused2; + unsigned long int st_mtimensec; /* Nsecs of last modification. */ __time_t st_ctime; /* Time of last status change. */ - unsigned long int __unused3; + unsigned long int st_ctimensec; /* Nsecs of last status change. */ +#endif # ifndef __USE_FILE_OFFSET64 unsigned long int __unused4; unsigned long int __unused5; @@ -123,12 +153,27 @@ struct stat64 int pad0; __dev_t st_rdev; /* Device number, if device. */ __off_t st_size; /* Size of file, in bytes. */ - __time_t st_atime; /* Time of last access. */ - long int __reserved0; /* Reserved for atime.nanoseconds. */ - __time_t st_mtime; /* Time of last modification. */ - long int __reserved1; /* Reserved for mtime.nanoseconds. */ - __time_t st_ctime; /* Time of last status change. */ - long int __reserved2; /* Reserved for ctime.nanoseconds. */ +#ifdef __USE_MISC + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the + identifier 'timespec' to appear in the <sys/stat.h> header. + Therefore we have to handle the use of this header in strictly + standard-compliant sources special. */ + struct timespec st_atim; /* Time of last access. */ + struct timespec st_mtim; /* Time of last modification. */ + struct timespec st_ctim; /* Time of last status change. */ +# define st_atime st_atim.tv_sec /* Backward compatibility. */ +# define st_mtime st_mtim.tv_sec +# define st_ctime st_ctim.tv_sec +#else + __time_t st_atime; /* Time of last access. */ + unsigned long int st_atimensec; /* Nscecs of last access. */ + __time_t st_mtime; /* Time of last modification. */ + unsigned long int st_mtimensec; /* Nsecs of last modification. */ + __time_t st_ctime; /* Time of last status change. */ + unsigned long int st_ctimensec; /* Nsecs of last status change. */ +#endif __blksize_t st_blksize; /* Optimal block size for I/O. */ __blkcnt64_t st_blocks; /* Nr. 512-byte blocks allocated. */ long int __unused[3]; @@ -150,12 +195,27 @@ struct stat64 __blksize_t st_blksize; /* Optimal block size for I/O. */ __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ +#ifdef __USE_MISC + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the + identifier 'timespec' to appear in the <sys/stat.h> header. + Therefore we have to handle the use of this header in strictly + standard-compliant sources special. */ + struct timespec st_atim; /* Time of last access. */ + struct timespec st_mtim; /* Time of last modification. */ + struct timespec st_ctim; /* Time of last status change. */ +# define st_atime st_atim.tv_sec /* Backward compatibility. */ +# define st_mtime st_mtim.tv_sec +# define st_ctime st_ctim.tv_sec +#else __time_t st_atime; /* Time of last access. */ - unsigned long int __unused1; + unsigned long int st_atimensec; /* Nscecs of last access. */ __time_t st_mtime; /* Time of last modification. */ - unsigned long int __unused2; + unsigned long int st_mtimensec; /* Nsecs of last modification. */ __time_t st_ctime; /* Time of last status change. */ - unsigned long int __unused3; + unsigned long int st_ctimensec; /* Nsecs of last status change. */ +#endif __ino64_t st_ino; /* File serial number. */ }; # endif diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/kernel_stat.h b/sysdeps/unix/sysv/linux/s390/s390-64/kernel_stat.h index 66ae0f3322..9b268dff33 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/s390/s390-64/kernel_stat.h @@ -1,5 +1,5 @@ /* Definition of `struct stat' used in the kernel. 64 bit S/390 version. - Copyright (C) 2001 Free Software Foundation, Inc. + Copyright (C) 2001, 2002 Free Software Foundation, Inc. Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). This file is part of the GNU C Library. @@ -26,21 +26,18 @@ struct kernel_stat unsigned int st_nlink; unsigned int st_uid; unsigned int st_gid; - unsigned int st_rdev; unsigned int __pad1; + unsigned int st_rdev; unsigned long int st_size; - unsigned long int st_atime; - unsigned long int st_mtime; - unsigned long int st_ctime; + struct timespec st_atim; + struct timespec st_mtim; + struct timespec st_ctim; unsigned int st_blksize; int st_blocks; - unsigned long __unused1; - unsigned long __unused2; + unsigned long __unused[3]; }; extern int __xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf); #define XSTAT_IS_XSTAT64 1 -#define _HAVE___UNUSED1 -#define _HAVE___UNUSED2 - +#define _HAVE_STAT_NSEC |