summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Willing <chris.willing@linux.com>2018-09-25 08:39:53 +1000
committerSven Eden <yamakuzure@gmx.net>2018-09-25 16:32:58 +0200
commit612bbecd2f2904be8ecb84f03a5bad3fff05a467 (patch)
tree80a1e273a052bbff9f315ca90fcb1c85dad01e3b
parent0af8158f8d08aab023d6a848a993af19be5d8480 (diff)
Deal with glibc-2.28
Closes: https://github.com/elogind/elogind/issues/74 Signed-off-by: Christoph Willing <chris.willing@linux.com> Signed-off-by: Sven Eden <sven.eden@prydeworx.com>
-rw-r--r--meson.build7
-rw-r--r--src/basic/missing.h2
2 files changed, 8 insertions, 1 deletions
diff --git a/meson.build b/meson.build
index 3e97f57f3..0d096d847 100644
--- a/meson.build
+++ b/meson.build
@@ -509,6 +509,13 @@ 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 <sys/stat.h>
+''', args : '-D_GNU_SOURCE') > 0)
+conf.set10('HAVE_STRUCT_STATX_IN_LINUX_STAT_H', cc.sizeof('struct statx', prefix : '''
+#include <linux/stat.h>
+''', 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 fb1478548..9be48eef8 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
+#if !HAVE_STRUCT_STATX_IN_SYS_STAT_H && !HAVE_STRUCT_STATX_IN_LINUX_STAT_H
struct statx_timestamp {
int64_t tv_sec;
uint32_t tv_nsec;