diff options
| author | Khem Raj <raj.khem@gmail.com> | 2022-07-25 10:56:53 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2022-07-27 01:31:20 +0000 |
| commit | a2f68263a1da5ad227bcb9cd8fa91b93c8b6c99f (patch) | |
| tree | 1c12b458d21cdd9e485b01ef909904c9464bfd81 /libarchive | |
| parent | a45905b0166713760a2fb4f2e908d7ce47488371 (diff) | |
| download | libarchive-a2f68263a1da5ad227bcb9cd8fa91b93c8b6c99f.tar.gz | |
libarchive: Do not include sys/mount.h when linux/fs.h is present
These headers are in conflict and only one is needed by
archive_read_disk_posix.c therefore include linux/fs.h if it exists
otherwise include sys/mount.h
It also helps compiling with glibc 2.36
where sys/mount.h conflicts with linux/mount.h see [1]
[1] https://sourceware.org/glibc/wiki/Release/2.36
Diffstat (limited to 'libarchive')
| -rw-r--r-- | libarchive/archive_read_disk_posix.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libarchive/archive_read_disk_posix.c b/libarchive/archive_read_disk_posix.c index 2b39e672..a96008db 100644 --- a/libarchive/archive_read_disk_posix.c +++ b/libarchive/archive_read_disk_posix.c @@ -34,9 +34,6 @@ __FBSDID("$FreeBSD$"); #ifdef HAVE_SYS_PARAM_H #include <sys/param.h> #endif -#ifdef HAVE_SYS_MOUNT_H -#include <sys/mount.h> -#endif #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> #endif @@ -54,6 +51,8 @@ __FBSDID("$FreeBSD$"); #endif #ifdef HAVE_LINUX_FS_H #include <linux/fs.h> +#elif HAVE_SYS_MOUNT_H +#include <sys/mount.h> #endif /* * Some Linux distributions have both linux/ext2_fs.h and ext2fs/ext2_fs.h. |