Include keyboard.h before frame.h.

(NULL) [WINDOWSNT]: Define NULL if not defined.
[USE_CRT_DLL]: Remove unnecessary extern, which screws
up dllimport attributes.

1 files changed, 6 insertions, 1 deletions

diff --git a/src/sysdep.c b/src/sysdep.c
index dc70bb8fb7c..a9b426eddba 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -54,7 +54,9 @@ Lisp_Object Vx_bitmap_file_path;
 #define read sys_read
 #define write sys_write
 #include <windows.h>
-extern int errno;
+#ifndef NULL
+#define NULL 0
+#endif
 #endif /* not WINDOWSNT */
 
 /* Does anyone other than VMS need this? */
@@ -106,9 +108,11 @@ extern unsigned start __asm__ ("start");
 #endif
 #endif
 
+#ifndef USE_CRT_DLL
 #ifndef errno
 extern int errno;
 #endif
+#endif
 
 #ifdef VMS
 #include <rms.h>
@@ -176,6 +180,7 @@ extern int errno;
 
 extern int quit_char;
 
+#include "keyboard.h"
 #include "frame.h"
 #include "window.h"
 #include "termhooks.h"