From: Daniel P. Berrange <berrange@redhat.com>
Date: Thu, 7 Mar 2013 16:34:54 +0000 (+0000)
Subject: Don't import loop.h unless HAVE_DECL_LO_FLAGS_AUTOCLEAR is defined
X-Git-Tag: v1.0.4-rc1~145
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=564e7d38a2ac686d7dee02761c5b4c7a5cff0a51;p=thirdparty%2Flibvirt.git

Don't import loop.h unless HAVE_DECL_LO_FLAGS_AUTOCLEAR is defined

The loop.h on RHEL4 is broken and cannot be imported. We already
detect this in configure as a side-effect of looking for whether
LO_FLAGS_AUTOCLEAR is available. We protected the impl with
HAVE_DECL_LO_FLAGS_AUTOCLEAR, but not the header import

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/src/util/virfile.c b/src/util/virfile.c
index eec9bccafa..4a9fa811b2 100644
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #include <dirent.h>
 
-#ifdef __linux__
+#if defined(__linux__) && HAVE_DECL_LO_FLAGS_AUTOCLEAR
 # include <linux/loop.h>
 # include <sys/ioctl.h>
 #endif