Commit e36ec798 authored by Andrew Innes's avatar Andrew Innes
Browse files

Include keyboard.h before frame.h.

(NULL) [WINDOWSNT]: Define NULL if not defined.
[USE_CRT_DLL]: Remove unnecessary extern, which screws
up dllimport attributes.
parent 03695ace
...@@ -54,7 +54,9 @@ Lisp_Object Vx_bitmap_file_path; ...@@ -54,7 +54,9 @@ Lisp_Object Vx_bitmap_file_path;
#define read sys_read #define read sys_read
#define write sys_write #define write sys_write
#include <windows.h> #include <windows.h>
extern int errno; #ifndef NULL
#define NULL 0
#endif
#endif /* not WINDOWSNT */ #endif /* not WINDOWSNT */
/* Does anyone other than VMS need this? */ /* Does anyone other than VMS need this? */
...@@ -106,9 +108,11 @@ extern unsigned start __asm__ ("start"); ...@@ -106,9 +108,11 @@ extern unsigned start __asm__ ("start");
#endif #endif
#endif #endif
#ifndef USE_CRT_DLL
#ifndef errno #ifndef errno
extern int errno; extern int errno;
#endif #endif
#endif
#ifdef VMS #ifdef VMS
#include <rms.h> #include <rms.h>
...@@ -176,6 +180,7 @@ extern int errno; ...@@ -176,6 +180,7 @@ extern int errno;
extern int quit_char; extern int quit_char;
#include "keyboard.h"
#include "frame.h" #include "frame.h"
#include "window.h" #include "window.h"
#include "termhooks.h" #include "termhooks.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment