]> granicus.if.org Git - strace/commitdiff
tests: fix build with fresh glibc
authorDmitry V. Levin <ldv@altlinux.org>
Sun, 15 Jul 2018 22:14:29 +0000 (22:14 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Sun, 15 Jul 2018 22:14:29 +0000 (22:14 +0000)
Workaround additional incompatibility between <sys/stat.h> and
<asm/stat.h> introduced by glibc-2.27.9000-566-gfd70af4.

* tests/xstatx.c (statx, statx_timestamp): Redefine before the inclusion
of <sys/stat.h> to avoid conflicts between definitions provided by the
linux kernel headers and the GNU libc.

tests/xstatx.c

index 7fb93265897c26417d5fe0e699fdb92e8d94e54d..441f4a8305cd7a8ecc1d26d0d7b7267df53f2328 100644 (file)
@@ -64,10 +64,14 @@ typedef off_t libc_off_t;
 
 # define stat libc_stat
 # define stat64 libc_stat64
+# define statx libc_statx
+# define statx_timestamp libc_statx_timestamp
 # include <fcntl.h>
 # include <sys/stat.h>
-# undef stat
+# undef statx_timestamp
+# undef statx
 # undef stat64
+# undef stat
 
 # undef st_atime
 # undef st_mtime