From: Anthony Liguori Date: Tue, 7 Aug 2012 00:31:55 +0000 (-0500) Subject: slirp: fix build on mingw32 X-Git-Tag: v1.2.0-rc0~78 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0b8db8fe15d17a529a5ea90614c11e9f031dfee8;p=thirdparty%2Fqemu.git slirp: fix build on mingw32 in_addr_t isn't available on mingw32. Just use an unsigned long instead. I considered typedef'ing in_addr_t on mingw32 but this would potentially be brittle if mingw32 did introduce the type. Cc: Jan Kiszka Signed-off-by: Anthony Liguori --- diff --git a/slirp/main.h b/slirp/main.h index bf601e223da..1f3b84de923 100644 --- a/slirp/main.h +++ b/slirp/main.h @@ -31,7 +31,7 @@ extern char *exec_shell; extern u_int curtime; extern fd_set *global_readfds, *global_writefds, *global_xfds; extern struct in_addr loopback_addr; -extern in_addr_t loopback_mask; +extern unsigned long loopback_mask; extern char *username; extern char *socket_path; extern int towrite_max; diff --git a/slirp/slirp.c b/slirp/slirp.c index 9787104b3b5..38e0a2193ae 100644 --- a/slirp/slirp.c +++ b/slirp/slirp.c @@ -30,7 +30,7 @@ /* host loopback address */ struct in_addr loopback_addr; /* host loopback network mask */ -in_addr_t loopback_mask; +unsigned long loopback_mask; /* emulated hosts use the MAC addr 52:55:IP:IP:IP:IP */ static const uint8_t special_ethaddr[ETH_ALEN] = {