[libvirt] [PATCH 3/7] Don't import loop.h unless HAVE_DECL_LO_FLAGS_AUTOCLEAR is defined

Daniel P. Berrange berrange at redhat.com
Thu Mar 7 17:56:39 UTC 2013


On Thu, Mar 07, 2013 at 10:42:49AM -0700, Eric Blake wrote:
> On 03/07/2013 09:41 AM, Daniel P. Berrange wrote:
> > From: "Daniel P. Berrange" <berrange at redhat.com>
> > 
> > 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 at redhat.com>
> > ---
> >  src/util/virfile.c | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/src/util/virfile.c b/src/util/virfile.c
> > index eec9bcc..9f79daf 100644
> > --- a/src/util/virfile.c
> > +++ b/src/util/virfile.c
> > @@ -32,7 +32,8 @@
> >  #include <unistd.h>
> >  #include <dirent.h>
> >  
> > -#ifdef __linux__
> > +#if defined(__linux__) && HAVE_DECL_LO_FLAGS_AUTOCLEAR
> > +# include <sys/types.h>
> 
> Drop the #include <sys/types.h> line, it adds nothing.

Opps, yes that was left over from an attempt to fix the loop.h on
rhel4 which failed

Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|




More information about the libvir-list mailing list