* dispextern.h: Change HAVE_X_WINDOWS to HAVE_WINDOW_SYSTEM,

around image definitions and prototypes.
(gamma_correct) [WINDOWSNT]: New prototype.

* w32term.c (x_make_frame_visible): Replace call to
input_poll_signal with poll_for_input.

* window.c [WINDOWSNT]: Include w32term.h.

* xdisp.c [WINDOWSNT]: Include w32term.h.

* makefile.nt: Add dependencies on w32gui.h.
(OBJ1): Include atimer.obj.
($(BLD)\atimer.obj): New dependency rule.

* w32.c (sigmask): New function (does nothing).
(sigunblock): Ditto.

* frame.c [WINDOWSNT]: Include w32term.h.

* w32gui.h (struct W32FontStruct): Add ascent and descent slots.

* lread.c (syms_of_lread): Fix literal newlines.

* emacs.c (USAGE): Split into USAGE1 and USAGE2, to work-around
the string constant limit (2048 bytes) in MSVC.
(main): Ditto.

3 files changed, 35 insertions, 0 deletions

diff --git a/src/.gitignore b/src/.gitignore
index 99af0328a10..661faaf62a4 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -9,3 +9,5 @@ temacs
 emacs
 emacs-*
 *.core
+obj
+obj-spd
diff --git a/src/ChangeLog b/src/ChangeLog
index 9bc3d6ab634..0f1696327a7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,33 @@
+2000-02-06  Andrew Innes  <andrewi@gnu.org>
+
+        * dispextern.h: Change HAVE_X_WINDOWS to HAVE_WINDOW_SYSTEM,
+        around image definitions and prototypes.
+        (gamma_correct) [WINDOWSNT]: New prototype.
+
+        * w32term.c (x_make_frame_visible): Replace call to
+        input_poll_signal with poll_for_input.
+
+        * window.c [WINDOWSNT]: Include w32term.h.
+
+        * xdisp.c [WINDOWSNT]: Include w32term.h.
+
+        * makefile.nt: Add dependencies on w32gui.h.
+        (OBJ1): Include atimer.obj.
+        ($(BLD)\atimer.obj): New dependency rule.
+
+        * w32.c (sigmask): New function (does nothing).
+        (sigunblock): Ditto.
+
+        * frame.c [WINDOWSNT]: Include w32term.h.
+
+        * w32gui.h (struct W32FontStruct): Add ascent and descent slots.
+
+        * lread.c (syms_of_lread): Fix literal newlines.
+
+        * emacs.c (USAGE): Split into USAGE1 and USAGE2, to work-around
+        the string constant limit (2048 bytes) in MSVC.
+        (main): Ditto.
+
 2000-02-05  INOUE Seiichiro <inoue@ainet.or.jp>
 
         * xterm.c (x_display_and_set_cursor) [HAVE_X_I18N]: Set pre-edit
diff --git a/src/xdisp.c b/src/xdisp.c
index e6c304501ed..7a3f25c5494 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -190,6 +190,9 @@ Boston, MA 02111-1307, USA.  */
 #ifdef HAVE_X_WINDOWS
 #include "xterm.h"
 #endif
+#ifdef WINDOWSNT
+#include "w32term.h"
+#endif
 
 #define min(a, b) ((a) < (b) ? (a) : (b))
 #define max(a, b) ((a) > (b) ? (a) : (b))