3 files changed, 15 insertions, 0 deletions

diff --git a/src/unexw32.c b/src/unexw32.c
index b1fa3e85eed..5d196a8b1cb 100644
--- a/src/unexw32.c
+++ b/src/unexw32.c
@@ -47,6 +47,11 @@ extern char my_endbss[];
 
 #include "w32heap.h"
 
+#undef min
+#undef max
+#define min(x, y) (((x) < (y)) ? (x) : (y))
+#define max(x, y) (((x) > (y)) ? (x) : (y))
+
 /* Basically, our "initialized" flag.  */
 BOOL need_to_recreate_heap = FALSE;
 
diff --git a/src/w32.c b/src/w32.c
index f64e015744d..ca05a17c833 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -79,6 +79,11 @@ Boston, MA 02111-1307, USA.
 #include "ndir.h"
 #include "w32heap.h"
  
+#undef min
+#undef max
+#define min(x, y) (((x) < (y)) ? (x) : (y))
+#define max(x, y) (((x) > (y)) ? (x) : (y))
+
 extern Lisp_Object Vw32_downcase_file_names;
 extern Lisp_Object Vw32_generate_fake_inodes;
 extern Lisp_Object Vw32_get_true_file_attributes;
diff --git a/src/w32term.c b/src/w32term.c
index 053c148bc3e..737d189f77f 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -49,6 +49,11 @@ Boston, MA 02111-1307, USA.  */
 #include "keyboard.h"
 #include "intervals.h"
 
+#undef min
+#undef max
+#define min(x, y) (((x) < (y)) ? (x) : (y))
+#define max(x, y) (((x) > (y)) ? (x) : (y))
+
 extern void free_frame_menubar ();
 
 extern Lisp_Object Vwindow_system;