aboutsummaryrefslogtreecommitdiff
path: root/slirp
diff options
context:
space:
mode:
authorblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2009-04-05 18:03:31 +0000
committerblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2009-04-05 18:03:31 +0000
commitb9e82a5946d902af445a53727c69b4851b1b20ff (patch)
tree4c71beccc51a0f88479b664c72e56272fd2a7f73 /slirp
parent1625af873aa8c9e4d22ad50a08e877110bf40623 (diff)
downloadqemu-b9e82a5946d902af445a53727c69b4851b1b20ff.zip
qemu-b9e82a5946d902af445a53727c69b4851b1b20ff.tar.gz
qemu-b9e82a5946d902af445a53727c69b4851b1b20ff.tar.bz2
Fix some win32 compile warnings
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6984 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'slirp')
-rw-r--r--slirp/misc.c6
-rw-r--r--slirp/socket.h1
2 files changed, 6 insertions, 1 deletions
diff --git a/slirp/misc.c b/slirp/misc.c
index 581db88..0137e75 100644
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -777,7 +777,11 @@ void
fd_nonblock(int fd)
{
#ifdef FIONBIO
- int opt = 1;
+#ifdef _WIN32
+ long opt = 1;
+#else
+ int opt = 1;
+#endif
ioctlsocket(fd, FIONBIO, &opt);
#else
diff --git a/slirp/socket.h b/slirp/socket.h
index 72b473d..f5adaba 100644
--- a/slirp/socket.h
+++ b/slirp/socket.h
@@ -87,6 +87,7 @@ void soisfconnecting _P((register struct socket *));
void soisfconnected _P((register struct socket *));
void soisfdisconnected _P((struct socket *));
void sofwdrain _P((struct socket *));
+struct iovec; /* For win32 */
size_t sopreprbuf(struct socket *so, struct iovec *iov, int *np);
int soreadbuf(struct socket *so, const char *buf, int size);