(min, max): Define as macros.

diff --git a/src/unexw32.c b/src/unexw32.c
index b1fa3e85eed40207121a0d286a5233563d709aca..5d196a8b1cbd119d5b0876aa37c5d8569e608510 100644 (file)
--- 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 f64e015744d401f2c65db2b44d82fba0847d097d..ca05a17c833a79aed7ac60444f2c75853b216554 100644 (file)
--- 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 053c148bc3ee8bdc8cec3c4add79798e2d071400..737d189f77f79fedc0c8b36cf674bc40fdccd6c9 100644 (file)
--- 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;