From 361ca89016aa934d7e6441e8345f1a93dc0f0a83 Mon Sep 17 00:00:00 2001
From: kichikuou <KichikuouChrome@gmail.com>
Date: Fri, 20 Jun 2025 08:11:35 +0900
Subject: [PATCH] Windows: #undef min / max in portab.h

---
 src/mmap.c        | 2 --
 src/portab.h      | 9 +++++++++
 src/win/console.c | 2 --
 src/win/dialog.c  | 2 --
 src/win/menubar.c | 2 --
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/mmap.c b/src/mmap.c
index 4d1622a..d36f139 100644
--- a/src/mmap.c
+++ b/src/mmap.c
@@ -21,8 +21,6 @@
 #include <stdlib.h>
 #ifdef _WIN32
 #include <windows.h>
-#undef max
-#undef min
 #else // _WIN32
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/portab.h b/src/portab.h
index 9c47418..60f705b 100644
--- a/src/portab.h
+++ b/src/portab.h
@@ -28,6 +28,15 @@
 #include <stdint.h>
 #include "config.h"
 
+#ifdef _WIN32
+# ifdef min
+#  undef min
+# endif
+# ifdef max
+#  undef max
+# endif
+# define NOMINMAX
+#endif
 #define min(x,y) ((x) < (y) ? (x) : (y))
 #define max(x,y) ((x) > (y) ? (x) : (y))
 
diff --git a/src/win/console.c b/src/win/console.c
index 4ba6071..7da34e5 100644
--- a/src/win/console.c
+++ b/src/win/console.c
@@ -17,8 +17,6 @@
  *
  */
 #include <windows.h>
-#undef min
-#undef max
 #include <stdio.h>
 #include <signal.h>
 #include "win/console.h"
diff --git a/src/win/dialog.c b/src/win/dialog.c
index 97720b8..343e5d8 100644
--- a/src/win/dialog.c
+++ b/src/win/dialog.c
@@ -18,8 +18,6 @@
  */
 #include <windows.h>
 #include <commctrl.h>
-#undef min
-#undef max
 #include <SDL_syswm.h>
 #include "menu.h"
 #include "gfx_private.h"
diff --git a/src/win/menubar.c b/src/win/menubar.c
index 06ba88f..9f71ca0 100644
--- a/src/win/menubar.c
+++ b/src/win/menubar.c
@@ -17,8 +17,6 @@
  *
  */
 #include <windows.h>
-#undef min
-#undef max
 #include <time.h>
 #include <SDL_syswm.h>
 #include "system.h"