From dc54a5eceb0c570a49393c7812c6a3f384518a08 Mon Sep 17 00:00:00 2001
From: Andrew Tonner <rakslice@gmail.com>
Date: Wed, 18 Jan 2017 04:51:34 -0800
Subject: [PATCH] missed commits

---
 .gitignore                                |  2 ++
 BasiliskII/src/Windows/ether_windows.cpp  |  2 ++
 BasiliskII/src/Windows/serial_windows.cpp | 10 ++++++----
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3e80b800..e6b6772b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -140,3 +140,5 @@ SheepShaver/src/Windows/config.log
 SheepShaver/src/kpx_cpu/src/cpu/jit/x86/codegen_x86.h
 BasiliskII/src/Windows/x64/
 SheepShaver/src/Windows/config.status
+SheepShaver/src/Windows/obj/
+SheepShaver/src/Windows/build_on_msys.cache.json
diff --git a/BasiliskII/src/Windows/ether_windows.cpp b/BasiliskII/src/Windows/ether_windows.cpp
index 1f59d830..4ff27f62 100755
--- a/BasiliskII/src/Windows/ether_windows.cpp
+++ b/BasiliskII/src/Windows/ether_windows.cpp
@@ -39,6 +39,8 @@
 #include "ether_windows.h"
 #include "router/router.h"
 #include "util_windows.h"
+// somehow util_windows undefines min
+#define min(x,y) ((x) < (y) ? (x) : (y))
 #include "libslirp.h"
 
 // Define to let the slirp library determine the right timeout for select()
diff --git a/BasiliskII/src/Windows/serial_windows.cpp b/BasiliskII/src/Windows/serial_windows.cpp
index 5a062b32..194bf838 100755
--- a/BasiliskII/src/Windows/serial_windows.cpp
+++ b/BasiliskII/src/Windows/serial_windows.cpp
@@ -28,6 +28,8 @@
 
 #include "main.h"
 #include "util_windows.h"
+// somehow util_windows undefines min
+#define min(x,y) ((x) < (y) ? (x) : (y))
 #include "macos_util.h"
 #include "prefs.h"
 #include "serial.h"
@@ -310,12 +312,12 @@ open_error:
 	if (input_thread_active) {
 		TerminateThread(input_thread_active,0);
 		CloseHandle(input_signal);
-		input_thread_active = false;
+		input_thread_active = 0;
 	}
 	if (output_thread_active) {
 		TerminateThread(output_thread_active,0);
 		CloseHandle(output_signal);
-		output_thread_active = false;
+		output_thread_active = 0;
 	}
 	if(fd != INVALID_HANDLE_VALUE) {
 		CloseHandle(fd);
@@ -674,13 +676,13 @@ int16 XSERDPort::close()
 	if (input_thread_active) {
 		quitting = true;
 		ReleaseSemaphore(input_signal,1,NULL);
-		input_thread_active = false;
+		input_thread_active = 0;
 		CloseHandle(input_signal);
 	}
 	if (output_thread_active) {
 		quitting = true;
 		ReleaseSemaphore(output_signal,1,NULL);
-		output_thread_active = false;
+		output_thread_active = 0;
 		// bugfix: was: CloseHandle(&output_signal);
 		CloseHandle(output_signal);
 	}