Re: [Qemu-devel] [Bug 1613133] [NEW] SLIRP code regression fails to build on OpenBSD

[Thomas Huth]

On 15.08.2016 09:15, Paolo Bonzini wrote:
> 
> 
> On 15/08/2016 08:53, Thomas Huth wrote:
>> On 15.08.2016 02:46, Brad Smith wrote:
>>> Public bug reported:
>>>
>>> The SLIRP code has regressed between 2.6 and 2.7 and now fails to build
>>> on OpenBSD.
>> [...]
>>> In file included from /usr/include/net/if.h:454:0,
>>>                  from slirp/slirp.c:34:
>>> /usr/include/net/if_arp.h:47:8: error: redefinition of 'struct arphdr'
>>>  struct arphdr {
>>>         ^
>>> In file included from slirp/slirp.c:29:0:
>>> slirp/slirp.h:108:8: note: originally defined here
>>>  struct arphdr {
>>>         ^
>>
>> Does it work again if you change the
>>
>> #ifndef _WIN32
>> #include <net/if.h>
>> #endif
>>
>> into
>>
>> #if !defined(_WIN32) && !defined(__OpenBSD__)
>> #include <net/if.h>
>> #endif
>>
>> at the beginning of slirp/slirp.c ?
> 
> Can the struct be renamed to struct slirp_arphdr instead?

Agreed, that's likely the more robust solution (though a slightly bigger
diff). I've just sent a patch with such a renaming...

 Thomas