From 3e280ae594f37cf8bab79ea51fcd8e2b30a8abcc Mon Sep 17 00:00:00 2001
From: Volker Ruppert <Volker.Ruppert@t-online.de>
Date: Sat, 29 Mar 2014 15:23:49 +0000
Subject: [PATCH] Fixed MSVC warnings

---
 bochs/iodev/network/slirp/compat.h  | 5 +++--
 bochs/iodev/network/slirp/socket.cc | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bochs/iodev/network/slirp/compat.h b/bochs/iodev/network/slirp/compat.h
index 10fb3ad8d..3c2af0516 100644
--- a/bochs/iodev/network/slirp/compat.h
+++ b/bochs/iodev/network/slirp/compat.h
@@ -18,14 +18,15 @@ typedef Bit16u uint16_t;
 typedef Bit32u uint32_t;
 typedef Bit64u uint64_t;
 typedef Bit64s ssize_t;
+#ifndef BX_OSDEP_H
 #define snprintf   _snprintf
 #define strdup     _strdup
 #define open       _open
 #define close      _close
-#ifndef BX_OSDEP_H
 #define lseek      _lseek
-#endif
 #define read       _read
+#define write      _write
+#endif
 #define strcasecmp _stricmp
 #endif
 
diff --git a/bochs/iodev/network/slirp/socket.cc b/bochs/iodev/network/slirp/socket.cc
index c1fe4cfd6..d1f4dac46 100644
--- a/bochs/iodev/network/slirp/socket.cc
+++ b/bochs/iodev/network/slirp/socket.cc
@@ -473,7 +473,7 @@ sorecvfrom(struct socket *so)
 	} else {                            	/* A "normal" UDP packet */
 	  struct mbuf *m;
           int len;
-#ifdef _WIN32
+#ifdef WIN32
           unsigned long n;
 #else
           int n;
@@ -493,7 +493,7 @@ sorecvfrom(struct socket *so)
 	  /* if (so->so_fport != htons(53)) { */
 	  ioctlsocket(so->s, FIONREAD, &n);
 
-	  if (n > len) {
+	  if ((int)n > len) {
 	    n = (m->m_data - m->m_dat) + m->m_len + n + 1;
 	    m_inc(m, n);
 	    len = M_FREEROOM(m);