From: Karel Zak <kzak@redhat.com>
Date: Tue, 20 Mar 2018 09:54:22 +0000 (+0100)
Subject: libmount: make libmount.h more robust
X-Git-Tag: v2.32~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1813c59c09fa887223d43e810b7dac9718a7522;p=thirdparty%2Futil-linux.git

libmount: make libmount.h more robust

Let's include sys/mount.h to be sure that our local libmount fallbacks
are not used by default to avoid possible conflicts with later included
sys/mount.h.

Addresses: https://github.com/systemd/systemd/pull/8452
Reported-by: Lennart Poettering <lennart@poettering.net>
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libmount/src/libmount.h.in b/libmount/src/libmount.h.in
index 463b8ddcc7..8f323fcbf9 100644
--- a/libmount/src/libmount.h.in
+++ b/libmount/src/libmount.h.in
@@ -28,6 +28,7 @@ extern "C" {
 #include <stdio.h>
 #include <mntent.h>
 #include <sys/types.h>
+#include <sys/mount.h>
 
 #define LIBMOUNT_VERSION   "@LIBMOUNT_VERSION@"
 #define LIBMOUNT_MAJOR_VERSION   @LIBMOUNT_MAJOR_VERSION@