# HG changeset patch # User Andrew Innes # Date 966987171 0 # Node ID 1c1c5d1eb49cb6c0e0cdc4f0e8b72da96741cfaf # Parent 14beb147ec06b7b9c5326bf62e2cc33db2a2950c Undefine min, max. diff -r 14beb147ec06 -r 1c1c5d1eb49c src/w32gui.h --- 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 +/* Emacs takes care of ensuring that these are defined. */ +#ifdef max +#undef max +#undef min +#endif + #include "w32bdf.h" typedef struct W32FontStruct { diff -r 14beb147ec06 -r 1c1c5d1eb49c src/w32heap.h --- 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 +/* 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))