From 9b8238ee3e3513afa302fc30387e5099127520fa Mon Sep 17 00:00:00 2001
From: James Touton <bekenn@gmail.com>
Date: Thu, 6 Aug 2015 02:18:21 -0700
Subject: [PATCH] Removed spurious #includes of Windows.h. Fixed some more
 calling convention annotations. Don't mutate the prefs string in
 init_tcp_listen_ports.

---
 BasiliskII/src/Windows/cdenable/cache.cpp    |  1 -
 BasiliskII/src/Windows/cdenable/eject_nt.cpp |  1 -
 BasiliskII/src/Windows/cdenable/ntcd.cpp     |  1 -
 BasiliskII/src/Windows/router/router.cpp     |  4 +---
 BasiliskII/src/Windows/router/tcp.cpp        | 10 ++++------
 5 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/BasiliskII/src/Windows/cdenable/cache.cpp b/BasiliskII/src/Windows/cdenable/cache.cpp
index 4e3375c2..483f3ca1 100755
--- a/BasiliskII/src/Windows/cdenable/cache.cpp
+++ b/BasiliskII/src/Windows/cdenable/cache.cpp
@@ -27,7 +27,6 @@
 */
 
 #include "sysdeps.h"
-#include "windows.h"
 #include "cache.h"
 
 #ifdef __cplusplus
diff --git a/BasiliskII/src/Windows/cdenable/eject_nt.cpp b/BasiliskII/src/Windows/cdenable/eject_nt.cpp
index b7a1357e..414ce4b9 100755
--- a/BasiliskII/src/Windows/cdenable/eject_nt.cpp
+++ b/BasiliskII/src/Windows/cdenable/eject_nt.cpp
@@ -22,7 +22,6 @@
 
 #include "sysdeps.h"
 
-#include "windows.h"
 #include <winioctl.h>
 
 // Prototypes
diff --git a/BasiliskII/src/Windows/cdenable/ntcd.cpp b/BasiliskII/src/Windows/cdenable/ntcd.cpp
index a4af0870..b263d2a8 100755
--- a/BasiliskII/src/Windows/cdenable/ntcd.cpp
+++ b/BasiliskII/src/Windows/cdenable/ntcd.cpp
@@ -21,7 +21,6 @@
  */
 
 #include "sysdeps.h"
-#include <windows.h>
 
 extern "C" {
 
diff --git a/BasiliskII/src/Windows/router/router.cpp b/BasiliskII/src/Windows/router/router.cpp
index 34df59fc..66086381 100755
--- a/BasiliskII/src/Windows/router/router.cpp
+++ b/BasiliskII/src/Windows/router/router.cpp
@@ -28,8 +28,6 @@
 
 #include "sysdeps.h"
 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
 #include <process.h>
 
 #include "cpu_emulation.h"
@@ -147,7 +145,7 @@ bool router_read_packet(uint8 *packet, int len)
 	Arguably an ugly hack, but needed since there is no way to
 	listen to all ports w/o writing another ndis filter driver
 */
-static WINAPI unsigned int router_expire_thread(void *arg)
+static unsigned int WINAPI router_expire_thread(void *arg)
 {
 	while(!is_router_shutting_down) {
 		close_old_sockets();
diff --git a/BasiliskII/src/Windows/router/tcp.cpp b/BasiliskII/src/Windows/router/tcp.cpp
index 3a3203e3..72d9a262 100755
--- a/BasiliskII/src/Windows/router/tcp.cpp
+++ b/BasiliskII/src/Windows/router/tcp.cpp
@@ -67,8 +67,6 @@
 
 #include "sysdeps.h"
 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
 #include <process.h>
 
 #include "cpu_emulation.h"
@@ -1333,7 +1331,7 @@ void write_tcp( tcp_t *tcp, int len )
 	- Expire time-waits.
 	- Handle resend timeouts.
 */
-static WINAPI unsigned int tcp_connect_close_thread(void *arg)
+static unsigned int WINAPI tcp_connect_close_thread(void *arg)
 {
 	WSAEVENT wait_handles[MAX_SOCKETS];
 
@@ -1429,7 +1427,7 @@ static WINAPI unsigned int tcp_connect_close_thread(void *arg)
 	return 0;
 }
 
-static WINAPI unsigned int tcp_listen_thread(void *arg)
+static unsigned int WINAPI tcp_listen_thread(void *arg)
 {
 	WSAEVENT wait_handles[MAX_SOCKETS];
 
@@ -1505,9 +1503,9 @@ static void init_tcp_listen_ports()
 	const char *port_str;
 	while ((port_str = PrefsFindString("tcp_port", index++)) != NULL) {
 		uint32 iface = 0;
-		char *if_str = strchr(port_str,',');
+		const char *if_str = strchr(port_str,',');
 		if(if_str) {
-			*if_str++ = 0;
+			if_str++;
 			uint32 if_net = _inet_addr( if_str );
 			if(if_net == INADDR_NONE) if_net = INADDR_ANY;
 			iface = ntohl( if_net );