From d552058570ea2c00fb88b4621be3285cda03033f Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Mon, 21 Dec 2020 09:09:43 -0300 Subject: alpha: Remove anonymous union in struct stat [BZ #27042] This is clever, but it confuses downstream detection in at least zstd and GNOME's glib. zstd has preprocessor tests for the 'st_mtime' macro, which is not provided by the path using the anonymous union; glib checks for the presence of 'st_mtimensec' in struct stat but then tries to access that field in struct statx (which might be a bug on its own). Checked with a build for alpha-linux-gnu. --- sysdeps/unix/sysv/linux/alpha/kernel_stat.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'sysdeps/unix/sysv/linux/alpha/kernel_stat.h') diff --git a/sysdeps/unix/sysv/linux/alpha/kernel_stat.h b/sysdeps/unix/sysv/linux/alpha/kernel_stat.h index ff69045f8f..a292920969 100644 --- a/sysdeps/unix/sysv/linux/alpha/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/alpha/kernel_stat.h @@ -9,9 +9,9 @@ struct kernel_stat unsigned int st_gid; unsigned int st_rdev; long int st_size; - unsigned long int st_atime; - unsigned long int st_mtime; - unsigned long int st_ctime; + unsigned long int st_atime_sec; + unsigned long int st_mtime_sec; + unsigned long int st_ctime_sec; unsigned int st_blksize; int st_blocks; unsigned int st_flags; @@ -34,11 +34,11 @@ struct kernel_stat64 unsigned int st_nlink; unsigned int __pad0; - unsigned long st_atime; + unsigned long st_atime_sec; unsigned long st_atimensec; - unsigned long st_mtime; + unsigned long st_mtime_sec; unsigned long st_mtimensec; - unsigned long st_ctime; + unsigned long st_ctime_sec; unsigned long st_ctimensec; long __glibc_reserved[3]; }; @@ -54,9 +54,9 @@ struct glibc2_stat __gid_t st_gid; __dev_t st_rdev; __off_t st_size; - __time_t st_atime; - __time_t st_mtime; - __time_t st_ctime; + __time_t st_atime_sec; + __time_t st_mtime_sec; + __time_t st_ctime_sec; unsigned int st_blksize; int st_blocks; unsigned int st_flags; @@ -74,9 +74,9 @@ struct glibc21_stat __gid_t st_gid; __dev_t st_rdev; __off_t st_size; - __time_t st_atime; - __time_t st_mtime; - __time_t st_ctime; + __time_t st_atime_sec; + __time_t st_mtime_sec; + __time_t st_ctime_sec; __blkcnt64_t st_blocks; __blksize_t st_blksize; unsigned int st_flags; -- cgit 1.4.1