From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:49801)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <thuth@redhat.com>) id 1bZDEq-0006Rv-Hs
	for qemu-devel@nongnu.org; Mon, 15 Aug 2016 04:27:17 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <thuth@redhat.com>) id 1bZDEm-000433-9A
	for qemu-devel@nongnu.org; Mon, 15 Aug 2016 04:27:15 -0400
Received: from mx1.redhat.com ([209.132.183.28]:42750)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <thuth@redhat.com>) id 1bZDEm-00042z-3I
	for qemu-devel@nongnu.org; Mon, 15 Aug 2016 04:27:12 -0400
References: <20160815004635.29411.18764.malonedeb@gac.canonical.com>
	<596e3698-47dc-949d-0cb5-78864e8d1d8c@redhat.com>
	<1656ee88-dda9-2158-c128-9d13e403e1e1@redhat.com>
From: Thomas Huth <thuth@redhat.com>
Message-ID: <b1cf8a65-2d4b-08e2-cd28-b9db6417e8bf@redhat.com>
Date: Mon, 15 Aug 2016 10:27:08 +0200
MIME-Version: 1.0
In-Reply-To: <1656ee88-dda9-2158-c128-9d13e403e1e1@redhat.com>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [Bug 1613133] [NEW] SLIRP code regression fails to
 build on OpenBSD
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Paolo Bonzini <pbonzini@redhat.com>, Bug 1613133 <1613133@bugs.launchpad.net>, qemu-devel@nongnu.org
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>

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