From ed47c81f8cdae7754c7920c0cb4a840b0679fb6f Mon Sep 17 00:00:00 2001
From: Frode Solheim <frode@fs-uae.net>
Date: Sat, 5 Sep 2015 01:47:40 +0200
Subject: [PATCH] slirp: some additional minor changes

---
 od-win32/inttypes.h | 10 ----------
 slirp/cksum.cpp     |  2 +-
 slirp/libslirp.h    |  8 --------
 slirp/slirp.h       | 13 +++++++++++--
 4 files changed, 12 insertions(+), 21 deletions(-)
 delete mode 100644 od-win32/inttypes.h

diff --git a/od-win32/inttypes.h b/od-win32/inttypes.h
deleted file mode 100644
index aae92fb4..00000000
--- a/od-win32/inttypes.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdint.h>
-
-typedef uint8_t u_int8_t;
-typedef uint16_t u_int16_t;
-typedef uint32_t u_int32_t;
-typedef uint64_t u_int64_t;
-
-typedef u_int8_t uint8;
-typedef u_int16_t uint16;
-typedef u_int32_t uint32;
diff --git a/slirp/cksum.cpp b/slirp/cksum.cpp
index 6184b64a..41c4adbf 100644
--- a/slirp/cksum.cpp
+++ b/slirp/cksum.cpp
@@ -72,7 +72,7 @@ int cksum(struct mbuf *m, int len)
 	/*
 	 * Force to even boundary.
 	 */
-	if ((1 & (long) w) && (mlen > 0)) {
+	if ((1 & (uintptr_t) w) && (mlen > 0)) {
 		REDUCE;
 		sum <<= 8;
 		s_util.c[0] = *(u_int8_t *)w;
diff --git a/slirp/libslirp.h b/slirp/libslirp.h
index 424a18a0..53acac81 100644
--- a/slirp/libslirp.h
+++ b/slirp/libslirp.h
@@ -9,10 +9,6 @@ int inet_aton(const char *cp, struct in_addr *ia);
 #include <arpa/inet.h>
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 int slirp_init(void);
 void slirp_cleanup(void);
 
@@ -34,8 +30,4 @@ int slirp_add_exec(int do_pty, const char *args, int addr_low_byte,
 
 extern char slirp_hostname[33];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/slirp/slirp.h b/slirp/slirp.h
index 4d0d6701..3d815c7d 100644
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -12,7 +12,16 @@
 #include "slirp_config.h"
 
 #ifdef _WIN32
-# include <inttypes.h>
+# include <stdint.h>
+
+typedef uint8_t u_int8_t;
+typedef uint16_t u_int16_t;
+typedef uint32_t u_int32_t;
+typedef uint64_t u_int64_t;
+
+typedef u_int8_t uint8;
+typedef u_int16_t uint16;
+typedef u_int32_t uint32;
 
 #ifdef _MSC_VER
 #define container_of(address, type, field) ((type *)( \
@@ -364,7 +373,7 @@ struct tcpcb *tcp_drop(struct tcpcb *tp, int err);
 #define MAX_MRU 16384
 #endif
 
-#ifndef _WIN32
+#ifndef _MSC_VER
 #define min(x,y) ((x) < (y) ? (x) : (y))
 #define max(x,y) ((x) > (y) ? (x) : (y))
 #endif
-- 
2.47.3