From c5b76b381081680633e2e0a91216507430409fb2 Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Sat, 13 Jun 2009 08:44:31 +0000 Subject: Fix mingw32 build warnings Work around buffer and ioctlsocket argument type signedness problems Suppress a prototype which is unused on mingw32 Expand a macro to avoid warnings from some GCC versions Signed-off-by: Blue Swirl --- slirp/misc.c | 6 +++++- slirp/socket.c | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'slirp') diff --git a/slirp/misc.c b/slirp/misc.c index 0137e75..1391d49 100644 --- a/slirp/misc.c +++ b/slirp/misc.c @@ -778,7 +778,7 @@ fd_nonblock(int fd) { #ifdef FIONBIO #ifdef _WIN32 - long opt = 1; + unsigned long opt = 1; #else int opt = 1; #endif @@ -797,7 +797,11 @@ void fd_block(int fd) { #ifdef FIONBIO +#ifdef _WIN32 + unsigned long opt = 0; +#else int opt = 0; +#endif ioctlsocket(fd, FIONBIO, &opt); #else diff --git a/slirp/socket.c b/slirp/socket.c index 098132a..82d026c 100644 --- a/slirp/socket.c +++ b/slirp/socket.c @@ -474,7 +474,12 @@ sorecvfrom(struct socket *so) udp_detach(so); } else { /* A "normal" UDP packet */ struct mbuf *m; - int len, n; + int len; +#ifdef _WIN32 + unsigned long n; +#else + int n; +#endif if (!(m = m_get())) return; m->m_data += IF_MAXLINKHDR; -- cgit v1.1