Undefine min, max.

c86a4064 · Andrew Innes · 2e4f6477 · c86a4064 · c86a4064
Commit c86a4064 authored Aug 22, 2000 by Andrew Innes
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 0 deletions

src/w32gui.h src/w32gui.h +6 -0

src/w32heap.h src/w32heap.h +5 -0

No files found.
--- 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 {

--- 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))