diff options
| author | Luke Shumaker <lukeshu@parabola.nu> | 2018-08-16 21:53:56 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@parabola.nu> | 2018-08-16 21:53:56 -0400 |
| commit | 6d135f850e76f618d130c0f051ff95682bf9b509 (patch) | |
| tree | a8c6d149ec1dc9db356c1967980b9e9ec61e8229 | |
| parent | b11f5d09ce51a2cfa09c5765eea065174a0ce3af (diff) | |
| parent | 928e4346c0b9d507f571d7827a4f63028c5e0a5b (diff) | |
Merge tag 'systemd/v239.0-2.parabola7' into systemd/parabolaHEADsystemd/parabola
| -rw-r--r-- | meson.build | 5 | ||||
| -rw-r--r-- | src/basic/missing.h | 5 | ||||
| -rw-r--r-- | src/basic/xattr-util.c | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 04331dd41a..a0e7240708 100644 --- a/meson.build +++ b/meson.build @@ -425,6 +425,7 @@ decl_headers = ''' #include <sys/stat.h> ''' # FIXME: key_serial_t is only defined in keyutils.h, this is bound to fail +# FIXME: these should use -D_GNU_SOURCE, since that is defined at build time foreach decl : ['char16_t', 'char32_t', @@ -439,6 +440,10 @@ 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) + 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 71a07d0574..14ad3d4914 100644 --- a/src/basic/missing.h +++ b/src/basic/missing.h @@ -15,7 +15,6 @@ #include <linux/neighbour.h> #include <linux/oom.h> #include <linux/rtnetlink.h> -#include <linux/stat.h> #include <net/ethernet.h> #include <stdlib.h> #include <sys/resource.h> @@ -25,6 +24,10 @@ #include <uchar.h> #include <unistd.h> +#if !HAVE_STRUCT_STATX_IN_SYS_STAT_H +#include <linux/stat.h> +#endif + #if HAVE_AUDIT #include <libaudit.h> #endif diff --git a/src/basic/xattr-util.c b/src/basic/xattr-util.c index c5c55ea846..0ee0979837 100644 --- a/src/basic/xattr-util.c +++ b/src/basic/xattr-util.c @@ -2,7 +2,6 @@ #include <errno.h> #include <fcntl.h> -#include <linux/stat.h> #include <stdint.h> #include <stdlib.h> #include <string.h> |