From: Andreas Schwab Date: Mon, 23 Nov 2009 15:34:39 +0000 (+0100) Subject: Use struct timespec for timestamps in struct stat also if __USE_XOPEN2K8 X-Git-Tag: glibc-2.16-ports-before-merge~560 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=127f9dc1f0b7c21112007f476d710ea6b70d13c0;p=thirdparty%2Fglibc.git Use struct timespec for timestamps in struct stat also if __USE_XOPEN2K8 --- diff --git a/ChangeLog.m68k b/ChangeLog.m68k index 74407c4c3e7..42d6a9115b4 100644 --- a/ChangeLog.m68k +++ b/ChangeLog.m68k @@ -1,3 +1,8 @@ +2009-11-23 Andreas Schwab + + * sysdeps/unix/sysv/linux/m68k/bits/stat.h: Use struct timespec + for timestamps also if __USE_XOPEN2K8. + 2009-11-19 Joseph Myers * sysdeps/unix/sysv/linux/m68k/bits/fcntl.h: Introduce new symbol diff --git a/sysdeps/unix/sysv/linux/m68k/bits/stat.h b/sysdeps/unix/sysv/linux/m68k/bits/stat.h index 8d18d6deeee..780104365c1 100644 --- a/sysdeps/unix/sysv/linux/m68k/bits/stat.h +++ b/sysdeps/unix/sysv/linux/m68k/bits/stat.h @@ -61,7 +61,7 @@ struct stat #else __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ #endif -#ifdef __USE_MISC +#if defined __USE_MISC || defined __USE_XOPEN2K8 /* 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 @@ -107,7 +107,7 @@ struct stat64 __blksize_t st_blksize; /* Optimal block size for I/O. */ __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ -#ifdef __USE_MISC +# if defined __USE_MISC || defined __USE_XOPEN2K8 /* 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 @@ -117,14 +117,14 @@ struct stat64 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. */ -#else +# 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 +# endif __ino64_t st_ino; /* File serial number. */ }; #endif