Only include the kernel's linux/stat.h headers if we haven't already picked up statx bits from glibc, to avoid redefinition. Suggested-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx> Tested-by: Bill O'Donnell <billodo@xxxxxxxxxx> Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx> --- diff --git a/io/stat.c b/io/stat.c index 517be66..37c0b2e 100644 --- a/io/stat.c +++ b/io/stat.c @@ -6,9 +6,6 @@ * Portions of statx support written by David Howells (dhowells@xxxxxxxxxx) */ -/* Try to pick up statx definitions from the system headers. */ -#include <linux/stat.h> - #include "command.h" #include "input.h" #include "init.h" diff --git a/io/statx.h b/io/statx.h index 4f40eaa..c6625ac 100644 --- a/io/statx.h +++ b/io/statx.h @@ -33,7 +33,14 @@ # endif #endif + +#ifndef STATX_TYPE +/* Pick up kernel definitions if glibc didn't already provide them */ +#include <linux/stat.h> +#endif + #ifndef STATX_TYPE +/* Local definitions if glibc & kernel headers didn't already provide them */ /* * Timestamp structure for the timestamps in struct statx.
