summaryrefslogtreecommitdiff
path: root/src/sysdep.c
diff options
context:
space:
mode:
authorAndrew Innes <andrewi@gnu.org>2000-08-22 22:40:16 +0000
committerAndrew Innes <andrewi@gnu.org>2000-08-22 22:40:16 +0000
commite36ec798cc3811bf267219ebddd411e6c3ddb309 (patch)
tree687f3351cc56c6a1feab13c25eb1ada3bc7cb6bd /src/sysdep.c
parent03695acef74e736c8d6538c56d39d535008fd72d (diff)
downloademacs-e36ec798cc3811bf267219ebddd411e6c3ddb309.tar.gz
Include keyboard.h before frame.h.
(NULL) [WINDOWSNT]: Define NULL if not defined. [USE_CRT_DLL]: Remove unnecessary extern, which screws up dllimport attributes.
Diffstat (limited to 'src/sysdep.c')
-rw-r--r--src/sysdep.c7
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"