[libvirt] [PATCH v2 1/3] cgroup: don't include sys/mount.h if not needed

Roman Bogorodskiy bogorodskiy at gmail.com
Mon Jan 11 00:34:03 UTC 2016


From: Jasper Lievisse Adriaanse <jasper at openbsd.org>

As cgroup implementation only works on Linux, it does not
make much sense to include sys/mount.h if other requirements are
not met, such as HAVE_MNTENT_H and HAVE_GETMNTENT_R.

Also, it fixes build on OpenBSD that requires to include sys/param.h
along with sys/mount.h.

Signed-off-by: Roman Bogorodskiy <bogorodskiy at gmail.com>
---
 src/util/vircgroup.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index e39c4d1..78f519c 100644
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -24,10 +24,9 @@
 #include <config.h>
 
 #include <stdio.h>
-#if defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R
+#if defined HAVE_MNTENT_H && defined HAVE_SYS_MOUNT_H \
+    && defined HAVE_GETMNTENT_R
 # include <mntent.h>
-#endif
-#if defined HAVE_SYS_MOUNT_H
 # include <sys/mount.h>
 #endif
 #include <fcntl.h>
-- 
2.4.6




More information about the libvir-list mailing list