From 520b6dd4d03742e285cc68cca308a2a74261c410 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Wed, 12 Jun 2013 16:31:44 +0400 Subject: main-loop: do not include slirp/slirp.h, use libslirp.h instead The header slirp/slirp.h is an internal header for slirp, and main-loop.c does not use internals from there. Instead, it uses public functions (slirp_update_timeout(), slirp_pollfds_fill() etc) which are declared in slirp/libslirp.h. Including slirp/slirp.h is somewhat dangerous since it redefines errno on WIN32, so any file including it may misbehave wrt errno. Unfortunately libslirp isn't self-contained, it needs declaration of struct in_addr, which is provided by qemu/sockets.h. Maybe instead of #including qemu/sockets.h before libslirp.h, it is better to make the latter self-contained. Signed-off-by: Michael Tokarev Reviewed-by: Paolo Bonzini --- main-loop.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main-loop.c b/main-loop.c index cf36645af4..a44fff6e9a 100644 --- a/main-loop.c +++ b/main-loop.c @@ -24,7 +24,8 @@ #include "qemu-common.h" #include "qemu/timer.h" -#include "slirp/slirp.h" +#include "qemu/sockets.h" // struct in_addr needed for libslirp.h +#include "slirp/libslirp.h" #include "qemu/main-loop.h" #include "block/aio.h" -- cgit v1.2.3