From patchwork Fri Jul 12 20:29:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ed Maste X-Patchwork-Id: 258794 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B570D2C0363 for ; Sat, 13 Jul 2013 06:30:17 +1000 (EST) Received: from localhost ([::1]:52091 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uxjyp-0002sL-6d for incoming@patchwork.ozlabs.org; Fri, 12 Jul 2013 16:30:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57752) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UxjyZ-0002s8-0p for qemu-devel@nongnu.org; Fri, 12 Jul 2013 16:30:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UxjyX-0005VW-LF for qemu-devel@nongnu.org; Fri, 12 Jul 2013 16:29:58 -0400 Received: from [216.171.111.232] (port=37574 helo=freebsd.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UxjyX-0005V2-FM for qemu-devel@nongnu.org; Fri, 12 Jul 2013 16:29:57 -0400 Received: from emaste (uid 1001) (envelope-from emaste@freebsd.org) id 9d34a by freebsd.org (DragonFly Mail Agent 1); Fri, 12 Jul 2013 16:29:55 -0400 From: Ed Maste To: qemu-devel@nongnu.org Date: Fri, 12 Jul 2013 16:29:52 -0400 Message-Id: <1373660992-92075-1-git-send-email-emaste@freebsd.org> X-Mailer: git-send-email 1.7.11.5 X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x X-Received-From: 216.171.111.232 Cc: qemu-trivial@nongnu.org, Ed Maste Subject: [Qemu-devel] [PATCH] slirp: reorder include to fix FreeBSD build failure X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Ed Maste --- The issue comes from slirp/mbuf.h #defining m_flags, which conflicts with a header included via on FreeBSD. I'm not sure exactly when this broke; I assume that it used to work because something previously caused the conflicting header to be included earlier, and that has now been removed. slirp/slirp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slirp/slirp.c b/slirp/slirp.c index 80b28ea..231afc8 100644 --- a/slirp/slirp.c +++ b/slirp/slirp.c @@ -24,8 +24,8 @@ #include "qemu-common.h" #include "qemu/timer.h" #include "sysemu/char.h" -#include "slirp.h" #include "hw/hw.h" +#include "slirp.h" /* host loopback address */ struct in_addr loopback_addr;