diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-07-26 20:03:12 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-07-26 23:41:48 +0900 |
| commit | 0a58cd00454cc7b57b04f3a4a334584d743d7f7a (patch) | |
| tree | 171a263f1591f5f8aa41070d7b5d597851c56242 /src/home | |
| parent | 52023622d2f8312887fcf72ca29bab4ad42c8eb7 (diff) | |
| download | systemd-0a58cd00454cc7b57b04f3a4a334584d743d7f7a.tar.gz | |
home: drop conflicted headers
Fixes #24117.
Diffstat (limited to 'src/home')
| -rw-r--r-- | src/home/homework-cifs.c | 5 | ||||
| -rw-r--r-- | src/home/homework-luks.c | 1 | ||||
| -rw-r--r-- | src/home/homework-mount.c | 2 | ||||
| -rw-r--r-- | src/home/homework.h | 3 |
4 files changed, 9 insertions, 2 deletions
diff --git a/src/home/homework-cifs.c b/src/home/homework-cifs.c index 728a92260c..e79def3dae 100644 --- a/src/home/homework-cifs.c +++ b/src/home/homework-cifs.c @@ -1,5 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include <sys/mount.h> +#if WANT_LINUX_FS_H +#include <linux/fs.h> +#endif + #include "dirent-util.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/home/homework-luks.c b/src/home/homework-luks.c index 0108ab5407..5f3e79a67a 100644 --- a/src/home/homework-luks.c +++ b/src/home/homework-luks.c @@ -4,7 +4,6 @@ #include <poll.h> #include <sys/file.h> #include <sys/ioctl.h> -#include <sys/mount.h> #include <sys/xattr.h> #if HAVE_VALGRIND_MEMCHECK_H diff --git a/src/home/homework-mount.c b/src/home/homework-mount.c index e71e8cd853..a9c793c429 100644 --- a/src/home/homework-mount.c +++ b/src/home/homework-mount.c @@ -2,7 +2,9 @@ #include <sched.h> #include <sys/mount.h> +#if WANT_LINUX_FS_H #include <linux/fs.h> +#endif #include "alloc-util.h" #include "fd-util.h" diff --git a/src/home/homework.h b/src/home/homework.h index 882a3f500b..b27c31d56b 100644 --- a/src/home/homework.h +++ b/src/home/homework.h @@ -1,13 +1,14 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include <linux/fs.h> #include <sys/vfs.h> #include "sd-id128.h" +#include "cryptsetup-util.h" #include "homework-password-cache.h" #include "loop-util.h" +#include "missing_fs.h" /* for FS_KEY_DESCRIPTOR_SIZE, do not include linux/fs.h */ #include "missing_keyctl.h" #include "missing_syscall.h" #include "user-record.h" |