[HAVE_NTGUI] (abort): New macro.

[HAVE_NTGUI] (HAVE_FACES): Defined.

[HAVE_NTGUI] (HAVE_WINDOW_SYSTEM): New macro.

1 files changed, 18 insertions, 0 deletions

diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index fcd02138b84..c29175f811d 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -231,6 +231,11 @@ void gettimeofday (struct timeval *, struct timezone *);
 #define HAVE_MOUSE              1
 #define HAVE_TZNAME             1
 
+#ifdef HAVE_NTGUI
+#define HAVE_WINDOW_SYSTEM
+#define HAVE_FACES
+#endif
+
 #define MODE_LINE_BINARY_TEXT(_b_) (NILP ((_b_)->buffer_file_type) ? "T" : "B")
 
 /* These have to be defined because our compilers treat __STDC__ as being
@@ -268,6 +273,10 @@ void gettimeofday (struct timeval *, struct timezone *);
 #define rindex  strrchr
 #define ctime   nt_ctime        /* Place a wrapper around ctime (see nt.c).  */
 
+#ifdef HAVE_NTGUI
+#define abort   win32_abort
+#endif
+
 /* Defines that we need that aren't in the standard signal.h  */
 #define SIGHUP  1               /* Hang up */
 #define SIGQUIT 3               /* Quit process */
@@ -328,4 +337,13 @@ struct nt_stat
 #endif
 #endif
 
+/* For proper declaration of environ.  */
+#include <stdlib.h>
+
+/* Emacs takes care of ensuring that these are defined.  */
+#ifdef max
+#undef max
+#undef min
+#endif
+
 /* ============================================================ */