Undefine min, max.

2 files changed, 11 insertions, 0 deletions

diff --git a/src/w32gui.h b/src/w32gui.h
index ba7b5c584a2..fdec0ab55ba 100644
--- a/src/w32gui.h
+++ b/src/w32gui.h
@@ -21,6 +21,12 @@ Boston, MA 02111-1307, USA.  */
 #ifndef EMACS_W32GUI_H
 #define EMACS_W32GUI_H
 #include <windows.h>
+/* Emacs takes care of ensuring that these are defined.  */
+#ifdef max
+#undef max
+#undef min
+#endif
+
 #include "w32bdf.h"
 
 typedef struct W32FontStruct {
diff --git a/src/w32heap.h b/src/w32heap.h
index d9848261f19..77004e9bcd5 100644
--- a/src/w32heap.h
+++ b/src/w32heap.h
@@ -25,6 +25,11 @@ Boston, MA 02111-1307, USA.
 #define NTHEAP_H_
 
 #include <windows.h>
+/* Emacs takes care of ensuring that these are defined.  */
+#ifdef max
+#undef max
+#undef min
+#endif
 
 #define ROUND_UP(p, align)   (((DWORD)(p) + (align)-1) & ~((align)-1))
 #define ROUND_DOWN(p, align) ((DWORD)(p) & ~((align)-1))