]> git.ipfire.org Git - thirdparty/libarchive.git/commit
projects / thirdparty / libarchive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a45905b) | patch
libarchive: Do not include sys/mount.h when linux/fs.h is present 1761/head
authorKhem Raj <raj.khem@gmail.com>
Mon, 25 Jul 2022 17:56:53 +0000 (10:56 -0700)
committerKhem Raj <raj.khem@gmail.com>
Wed, 27 Jul 2022 01:31:20 +0000 (01:31 +0000)
commita2f68263a1da5ad227bcb9cd8fa91b93c8b6c99f
tree1c12b458d21cdd9e485b01ef909904c9464bfd81tree | snapshot
parenta45905b0166713760a2fb4f2e908d7ce47488371commit | diff
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
libarchive/archive_read_disk_posix.c diff | blob | blame | history
Mirror of https://github.com/libarchive/libarchive.git