Merged in changes from CVS trunk.

[bpt/emacs.git] / src / w32heap.h

diff --git a/src/w32heap.h b/src/w32heap.h
index 8c50c08..7fdf952 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))
@@ -108,3 +103,6 @@ IMAGE_SECTION_HEADER * find_section (char * name, IMAGE_NT_HEADERS * nt_header);
 IMAGE_SECTION_HEADER * rva_to_section (DWORD rva, IMAGE_NT_HEADERS * nt_header);
 
 #endif /* NTHEAP_H_ */
+
+/* arch-tag: 3ba4cbe1-8a09-4a41-8f37-fd31f7426b3c
+   (do not change this comment) */