From afef4bc781c1faf9d79ccae2c25078c83d5e48b0 Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Mon, 5 Dec 2022 19:03:11 -0500
Subject: [PATCH] issue with mingw resolved; resume mingw build in CI

---
 azure-pipelines.yml    |  8 ++++----
 sys/windows/windmain.c | 11 +++++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 12d615d43..49d105be4 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -32,10 +32,10 @@ strategy:
       imageName: 'windows-latest'
       toolchainName: vs
       buildTargetName: all
-#    windows-mingw:
-#      imageName: 'windows-2019'
-#      toolchainName: mingw
-#      buildTargetName: all
+    windows-mingw:
+      imageName: 'windows-2019'
+      toolchainName: mingw
+      buildTargetName: all
     linux_focal_cross_msdos:
       imageName: 'ubuntu-20.04'
       toolchainName: cross
diff --git a/sys/windows/windmain.c b/sys/windows/windmain.c
index 5e3a5ce2f..6e7cd0c67 100644
--- a/sys/windows/windmain.c
+++ b/sys/windows/windmain.c
@@ -430,12 +430,15 @@ extern const char *known_restrictions[]; /* symbols.c */
  * to help MinGW decide which entry point to choose. If both main and
  * WinMain exist, the resulting executable won't work correctly.
  */
-int
-#ifndef __MINGW32__ 
-main(int argc, char *argv[])
+
+#if defined(__MINGW32__) && defined(MSWIN_GRAPHICS)
+#define MAIN mingw_main
 #else
-mingw_main(int argc, char *argv[])
+#define MAIN main
 #endif
+
+int
+MAIN(int argc, char *argv[])
 {
     boolean resuming = FALSE; /* assume new game */
     NHFILE *nhfp;