diff options
| author | Tim Kientzle <kientzle@acm.org> | 2022-08-04 19:43:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-04 19:43:12 -0700 |
| commit | 66d6e8a9166d3a340a16e1bd861fea9e1c186af3 (patch) | |
| tree | 3af41970bafd6813ce8e60c59f0742a23185a079 /libarchive | |
| parent | 2eb700495c4c384cde5c5d4c3e9b9d5d5ca674a8 (diff) | |
| parent | a2f68263a1da5ad227bcb9cd8fa91b93c8b6c99f (diff) | |
| download | libarchive-66d6e8a9166d3a340a16e1bd861fea9e1c186af3.tar.gz | |
Merge pull request #1761 from kraj/master
libarchive: Remove unneeded linux/fs.h include
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. |