summaryrefslogtreecommitdiff
path: root/src/w32heap.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/w32heap.h')
-rw-r--r--src/w32heap.h5
1 files changed, 5 insertions, 0 deletions
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))