Mercurial > emacs

changeset 31112:1c1c5d1eb49c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Undefine min, max.
author Andrew Innes <andrewi@gnu.org>
date Tue, 22 Aug 2000 23:32:51 +0000
parents 14beb147ec06
children 1743924e00dd
files src/w32gui.h src/w32heap.h
diffstat 2 files changed, 11 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/w32gui.h	Tue Aug 22 23:31:00 2000 +0000
+++ b/src/w32gui.h	Tue Aug 22 23:32:51 2000 +0000
@@ -21,6 +21,12 @@
 #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 {
--- a/src/w32heap.h	Tue Aug 22 23:31:00 2000 +0000
+++ b/src/w32heap.h	Tue Aug 22 23:32:51 2000 +0000
@@ -25,6 +25,11 @@
 #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))