[libvirt] [PATCH] Include some extra headers needed for OpenBSD.

[Eric Blake]

On 09/04/2012 10:23 AM, Jasper Lievisse Adriaanse wrote:
> On Tue, Sep 04, 2012 at 09:18:20AM -0600, Eric Blake wrote:
>> On 09/04/2012 08:57 AM, Jasper Lievisse Adriaanse wrote:
>>> >From bafcb4ed2b90b5ba845ca6b61861e3caa548b16a Mon Sep 17 00:00:00 2001
>>> From: Jasper Lievisse Adriaanse <jasper at humppa.nl>
>>> Date: Tue, 4 Sep 2012 16:57:09 +0200
>>> Subject: [PATCH] Include some extra headers needed for OpenBSD.
>>>
>>> ---
>>>  src/util/virnetdevbridge.c |    9 +++++++++
>>>  1 files changed, 9 insertions(+), 0 deletions(-)
>>
>> Please show the compiler errors that you got without these includes.  I
>> can't help but wonder if you have instead uncovered a bug in the gnulib
>> headers, but knowing which symbols were not declared makes a difference
>> in answering that question.

I'd still like to know the compiler error you got when <sys/socket.h>
was not present, but just guessing from the source code, I see one call
of socket() (protected behind #if defined(HAVE_NET_IF_H) &&
defined(SIOCBRADDBR), but maybe those are both true for OpenBSD?).  Even
though I'm pushing, I would STILL like to know why.

>>
>> This line shouldn't be necessary; gnulib guarantees a working
>> <sys/socket.h> on all architectures.
> OK. Could you please push this one then?

Here's what I squashed in before pushing; I also added you to AUTHORS.
Let me know if you prefer an alternate spelling or email address (the
file is in UTF-8, if that matters).

diff --git i/src/util/virnetdevbridge.c w/src/util/virnetdevbridge.c
index 8559223..a29e4b2 100644
--- i/src/util/virnetdevbridge.c
+++ w/src/util/virnetdevbridge.c
@@ -30,14 +30,7 @@
 #include "intprops.h"

 #include <sys/ioctl.h>
-
-#ifdef HAVE_SYS_PARAM_H
-# include <sys/param.h>
-#endif
-
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
+#include <sys/socket.h>

 #ifdef HAVE_NET_IF_H
 # include <net/if.h>

-- 
Eric Blake   eblake at redhat.com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 617 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20120904/60d774e4/attachment-0001.sig>