Do not undef min and max.

diff --git a/src/ChangeLog b/src/ChangeLog
index 978f7ee5a83789d9a32075896701889891aa4a27..fcd316010fa7031477c0fb50355fe47d5b2b01d2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2001-10-08  Andrew Innes  <andrewi@gnu.org>
+
+       * lisp.h [max]: Undef min and max before redefining them.
+
+       * w32gui.h: Do not undef min and max.
+
+       * w32heap.h: Do not undef min and max.
+
+       * s/ms-w32.h: Do not undef min and max.
+
 2001-10-08  Stefan Monnier  <monnier@cs.yale.edu>
 
        * xdisp.c (handle_fontified_prop): Don't bind after-change-functions.

diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index 0ec0ef5f60b6ffc18e53d625969a4faa3acb146c..7c1c62e3ffd979d46aa5a3b22f0ae709b831c48e 100644 (file)
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -457,12 +457,6 @@ extern char *get_emacs_configuration_options (void);
 #endif
 #include <string.h>
 
-/* Emacs takes care of ensuring that these are defined.  */
-#ifdef max
-#undef max
-#undef min
-#endif
-
 /* We need a little extra space, see ../../lisp/loadup.el */
 #define SYSTEM_PURESIZE_EXTRA 137500
 

diff --git a/src/w32gui.h b/src/w32gui.h
index 3d4909217fe7b11c7e33306f516e253cf23474b0..13a9b9b2104ab2471409ae755bf7d177f574502b 100644 (file)
--- a/src/w32gui.h
+++ b/src/w32gui.h
@@ -21,11 +21,6 @@ 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"
 

diff --git a/src/w32heap.h b/src/w32heap.h
index 8c50c0886755fa360fe07fd07ff5274d99981c65..6abd658b76dec586cf6edf1358da69babdab6b41 100644 (file)
--- a/src/w32heap.h
+++ b/src/w32heap.h
@@ -25,11 +25,6 @@ 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))