Merge branch 'emacs-24'

[gnu-emacs] / src / unexw32.c

diff --git a/src/unexw32.c b/src/unexw32.c
index 7cbd95a46fedd24b648fc97e29c04b39857219bc..5c1c1f3f391bbd375df74cfd3bd84e6bfecb6b02 100644 (file)
--- a/src/unexw32.c
+++ b/src/unexw32.c
@@ -43,19 +43,11 @@ PIMAGE_NT_HEADERS
 extern BOOL ctrl_c_handler (unsigned long type);
 
 extern char my_begdata[];
-extern char my_edata[];
 extern char my_begbss[];
-extern char my_endbss[];
 extern char *my_begbss_static;
-extern char *my_endbss_static;
 
 #include "w32heap.h"
 
-#undef min
-#undef max
-#define min(x, y) (((x) < (y)) ? (x) : (y))
-#define max(x, y) (((x) > (y)) ? (x) : (y))
-
 /* Basically, our "initialized" flag.  */
 BOOL using_dynamic_heap = FALSE;