From d4aa0454e39991b20801ec1f99c475156190c8ef Mon Sep 17 00:00:00 2001
From: Frode Solheim <frode@fs-uae.net>
Date: Sat, 14 May 2016 17:01:08 +0200
Subject: [PATCH] Windows fixes for segtracker / vpar

---
 src/debug.cpp        | 10 +++++-----
 src/od-fs/parser.cpp |  5 ++++-
 src/segtracker.cpp   |  5 +++++
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/debug.cpp b/src/debug.cpp
index e70183691..67ce3be57 100644
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -4317,13 +4317,13 @@ static void segtracker(TCHAR **inptr)
 				int found = segtracker_search_address(addr, &sl, &num_seg);
 				if(found) {
 					segment *seg = &sl->segments[num_seg];
-					uae_u32 s_addr = seg->addr;
-					uae_u32 s_size = seg->size;
-					uae_u32 s_end = s_addr + s_size;
-					uae_u32 offset = addr - s_addr;
+					uae_u32 seg_addr = seg->addr;
+					uae_u32 seg_size = seg->size;
+					uae_u32 seg_end = seg_addr + seg_size;
+					uae_u32 offset = addr - seg_addr;
 					console_out_f(_T("%08x: '%s' #%02d [%08x,%08x,%08x] +%08x\n"),
 								addr, sl->name, num_seg,
-								s_addr, s_size, s_end,
+								seg_addr, seg_size, seg_end,
 								offset);
 
 					/* try to find symbol info */
diff --git a/src/od-fs/parser.cpp b/src/od-fs/parser.cpp
index c948ed82b..7b6cf1b6c 100644
--- a/src/od-fs/parser.cpp
+++ b/src/od-fs/parser.cpp
@@ -138,8 +138,11 @@ static void parallel_tcp_close(void)
 
 void parallel_ack(void)
 {
-	if (vpar_enabled()) {
+	if (0) {
+#ifdef WITH_VPAR
+	} else if (vpar_enabled()) {
 		/* Do nothing, acking is instead done via parallel_poll_ack. */
+#endif
 	} else {
 		cia_parallelack();
 	}
diff --git a/src/segtracker.cpp b/src/segtracker.cpp
index 9056edf39..c91295ad9 100644
--- a/src/segtracker.cpp
+++ b/src/segtracker.cpp
@@ -26,6 +26,11 @@ static patch_func pf_LoadSeg;
 static patch_func pf_UnLoadSeg;
 static patch_func pf_NewLoadSeg;
 
+#ifdef _WIN32
+#define strcasestr strstr
+#warning Needs strcasestr replacement
+#endif
+
 int segtracker_enabled = 0;
 
 /* patch the interesting DOS functions.