# HG changeset patch
# User Andrew Innes <andrewi@gnu.org>
# Date 966987805 0
# Node ID bbd7763673b648a32bab9afac574cea2528b48b0
# Parent  42753ce203f87ca3bef3d9b350d2e07fbc904965
Include keyboard.h before frame.h.
[USE_CRT_DLL]: Remove unnecessary extern, which screws
up dllimport attributes.
(x_update_window_end): Update prototype.

diff -r 42753ce203f8 -r bbd7763673b6 src/w32term.c
--- a/src/w32term.c	Tue Aug 22 23:39:00 2000 +0000
+++ b/src/w32term.c	Tue Aug 22 23:43:25 2000 +0000
@@ -41,6 +41,7 @@
 #include <setjmp.h>
 #include <sys/stat.h>
 
+#include "keyboard.h"
 #include "frame.h"
 #include "dispextern.h"
 #include "fontset.h"
@@ -51,7 +52,6 @@
 #include "disptab.h"
 #include "buffer.h"
 #include "window.h"
-#include "keyboard.h"
 #include "intervals.h"
 #include "composite.h"
 #include "coding.h"
@@ -315,7 +315,9 @@
 
 extern Lisp_Object Qface, Qmouse_face;
 
+#ifndef USE_CRT_DLL
 extern int errno;
+#endif
 
 /* A mask of extra modifier bits to put into every keyboard char.  */
 
@@ -334,7 +336,7 @@
   DRAW_IMAGE_SUNKEN
 };
 
-static void x_update_window_end P_ ((struct window *, int));
+static void x_update_window_end P_ ((struct window *, int, int));
 static void frame_to_window_pixel_xy P_ ((struct window *, int *, int *));
 void w32_delete_display P_ ((struct w32_display_info *));
 static int fast_find_position P_ ((struct window *, int, int *, int *,