From 2e0ffb64e2542f85991afdc9d35d4299e9813fed Mon Sep 17 00:00:00 2001 From: Sven Eden Date: Wed, 26 Sep 2018 17:58:00 +0200 Subject: [PATCH] Enhance the dealing with glibc-2.28 It appears that the necessary bits were already there, but commented out. When meson checked for 'struct statx', the inclusion of both sys/stat.h and linux/stat.h where commented out. Uncommenting them should be enough. --- meson.build | 11 ++--------- src/basic/missing.h | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/meson.build b/meson.build index 8b62c789e..45262dcff 100644 --- a/meson.build +++ b/meson.build @@ -491,8 +491,8 @@ decl_headers = ''' #include #include #include -//#include -//#include +#include +#include ''' # FIXME: key_serial_t is only defined in keyutils.h, this is bound to fail @@ -509,13 +509,6 @@ foreach decl : ['char16_t', conf.set10('HAVE_' + decl.underscorify().to_upper(), have) endforeach -conf.set10('HAVE_STRUCT_STATX_IN_SYS_STAT_H', cc.sizeof('struct statx', prefix : ''' -#include -''', args : '-D_GNU_SOURCE') > 0) -conf.set10('HAVE_STRUCT_STATX_IN_LINUX_STAT_H', cc.sizeof('struct statx', prefix : ''' -#include -''', args : '-D_GNU_SOURCE') > 0) - foreach decl : [['IFLA_INET6_ADDR_GEN_MODE', 'linux/if_link.h'], ['IN6_ADDR_GEN_MODE_STABLE_PRIVACY', 'linux/if_link.h'], ['IFLA_VRF_TABLE', 'linux/if_link.h'], diff --git a/src/basic/missing.h b/src/basic/missing.h index 9be48eef8..fb1478548 100644 --- a/src/basic/missing.h +++ b/src/basic/missing.h @@ -1371,7 +1371,7 @@ struct fib_rule_uid_range { #define PF_KTHREAD 0x00200000 #endif -#if !HAVE_STRUCT_STATX_IN_SYS_STAT_H && !HAVE_STRUCT_STATX_IN_LINUX_STAT_H +#if ! HAVE_STRUCT_STATX struct statx_timestamp { int64_t tv_sec; uint32_t tv_nsec; -- 2.30.2