| Message ID | 1373660992-92075-1-git-send-email-emaste@freebsd.org |
|---|---|
| State | New |
| Headers | show |
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;
Signed-off-by: Ed Maste <emaste@freebsd.org> --- The issue comes from slirp/mbuf.h #defining m_flags, which conflicts with a header included via <semaphore.h> 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(-)