]> git.ipfire.org Git - thirdparty/util-linux.git/commit
include/statfs_magic.h: avoid sys/mount.h and linux/fs.h collision
authorKarel Zak <kzak@redhat.com>
Tue, 7 Apr 2026 13:34:13 +0000 (15:34 +0200)
committerKarel Zak <kzak@redhat.com>
Tue, 7 Apr 2026 13:34:13 +0000 (15:34 +0200)
commit5f66e252c1c2dd0e7a8a5f429cdfa4798cfa3d85
treed993a002962c1d0c160f18c9c4d7ac7b6595d929
parentafdade4a3d8e4e6070343c5576470c575719b81f
include/statfs_magic.h: avoid sys/mount.h and linux/fs.h collision

Guard the sys/mount.h include with !defined(MS_RDONLY) to prevent
redefinition errors when linux/fs.h has already been included (e.g.,
in fstrim.c). This follows the same pattern used in libmount.h.in.

Fixes: 1af964d935 ("include/statfs_magic.h: add portable struct statfs headers for Darwin")
Signed-off-by: Karel Zak <kzak@redhat.com>
include/statfs_magic.h