From eb7e3b81593eb776c87907fea64279a8fbb9848c Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Thu, 20 Dec 2012 13:30:28 -0800
Subject: [PATCH 1/3] Fixed compiler issue when compiling with MinGW.

---
 Ibm1130/ibm1130_stddev.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Ibm1130/ibm1130_stddev.c b/Ibm1130/ibm1130_stddev.c
index d71d45b4..d596fb07 100644
--- a/Ibm1130/ibm1130_stddev.c
+++ b/Ibm1130/ibm1130_stddev.c
@@ -340,7 +340,7 @@ t_stat emit_conout_character (int ch)
 	return map_conout_character(ch);
 }
 
-static void Beep (void)			/* notify user keyboard was locked or key was bad */
+static void SendBeep (void)			/* notify user keyboard was locked or key was bad */
 {
 	sim_putchar(7);
 }
@@ -395,7 +395,7 @@ static t_stat tti_svc (UNIT *uptr)
 	}
 
 	if ((tti_unit.flags & KEYBOARD_LOCKED) || ! (tti_dsw & TT_DSW_KEYBOARD_BUSY)) {
-		Beep();
+		SendBeep();
 		return SCPE_OK;
 	}
 
@@ -403,7 +403,7 @@ static t_stat tti_svc (UNIT *uptr)
 		temp = ascii_to_conin[temp];
 
 	if (temp == 0)	{							/* ignore invalid characters */
-		Beep();
+		SendBeep();
 		calc_ints();
 		return SCPE_OK;
 	}

From b9ebd93bbd516843a1f347fe9a653571411c9855 Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Thu, 20 Dec 2012 13:46:03 -0800
Subject: [PATCH 2/3] Fixed build with MinGW when invoked with the
 build_mingw_ether.bat file.

---
 makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/makefile b/makefile
index 3bfcf389..076993b0 100644
--- a/makefile
+++ b/makefile
@@ -336,7 +336,7 @@ else
     MKDIRBIN = if not exist BIN mkdir BIN
   endif
   ifneq ($(USE_NETWORK),)
-    NETWORK_OPT = -DUSE_SHARED
+    NETWORK_OPT += -DUSE_SHARED
   endif
 endif
 ifneq ($(DEBUG),)

From 9e421ada27590f6a83dcc3d0936588c5190d1e66 Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Thu, 20 Dec 2012 13:51:54 -0800
Subject: [PATCH 3/3] Cleanup compiler warning messages when building with
 MinGW

---
 sim_defs.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sim_defs.h b/sim_defs.h
index ebca45ed..7ad0132c 100644
--- a/sim_defs.h
+++ b/sim_defs.h
@@ -659,6 +659,9 @@ extern int32 sim_asynch_inst_latency;
 /* which avoids the potential ABA issues.                                   */
 #ifdef _WIN32
 #include <winsock2.h>
+#ifdef PACKED
+#undef PACKED
+#endif /* PACKED */
 #ifdef ERROR
 #undef ERROR
 #endif /* ERROR */