Include keyboard.h before frame.h.

[USE_CRT_DLL]: Remove unnecessary extern, which
screws up dllimport attributes.

diff --git a/src/keyboard.c b/src/keyboard.c
index 0dfae2f76d75a2516915d0d193af2f17ad4ad1ca..6c25c3d99ee198a2371b32f3b516ca3c62a1a372 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -27,6 +27,7 @@ Boston, MA 02111-1307, USA.  */
 #include "lisp.h"
 #include "termhooks.h"
 #include "macros.h"
+#include "keyboard.h"
 #include "frame.h"
 #include "window.h"
 #include "commands.h"
@@ -34,7 +35,6 @@ Boston, MA 02111-1307, USA.  */
 #include "charset.h"
 #include "disptab.h"
 #include "dispextern.h"
-#include "keyboard.h"
 #include "syntax.h"
 #include "intervals.h"
 #include "blockinput.h"
@@ -73,7 +73,9 @@ Boston, MA 02111-1307, USA.  */
 /* Include systime.h after xterm.h to avoid double inclusion of time.h. */
 #include "systime.h"
 
+#ifndef USE_CRT_DLL
 extern int errno;
+#endif
 
 /* Variables for blockinput.h: */