Andreas Schwab
03cbcf5551
- statx-redefinition.patch: Workaround incompatibility between <sys/stat.h> and <asm/stat.h> OBS-URL: https://build.opensuse.org/request/show/626904 OBS-URL: https://build.opensuse.org/package/show/devel:tools/strace?expand=0&rev=91
39 lines
1.0 KiB
Diff
39 lines
1.0 KiB
Diff
From 3dbffb74cc2b4323016ba8ba05380a6aba5f3a8f Mon Sep 17 00:00:00 2001
|
|
From: "Dmitry V. Levin" <ldv@altlinux.org>
|
|
Date: Sun, 15 Jul 2018 22:14:29 +0000
|
|
Subject: [PATCH] tests: fix build with fresh glibc
|
|
|
|
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 | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/tests/xstatx.c b/tests/xstatx.c
|
|
index 7fb9326589..441f4a8305 100644
|
|
--- a/tests/xstatx.c
|
|
+++ b/tests/xstatx.c
|
|
@@ -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
|
|
--
|
|
2.18.0
|
|
|