comparison src/sysdep.c @ 109793:b60dcdd855f0

Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Sun, 08 Aug 2010 22:52:25 +0000
parents f18fad7de4f5
children 64732fa6188a
comparison
equal deleted inserted replaced
109649:1f8f03cfcd2b 109793:b60dcdd855f0
94 #if defined (USG) 94 #if defined (USG)
95 #include <sys/utsname.h> 95 #include <sys/utsname.h>
96 #include <memory.h> 96 #include <memory.h>
97 #endif /* USG */ 97 #endif /* USG */
98 98
99 extern int quit_char;
100
101 #include "keyboard.h" 99 #include "keyboard.h"
102 #include "frame.h" 100 #include "frame.h"
103 #include "window.h" 101 #include "window.h"
104 #include "termhooks.h" 102 #include "termhooks.h"
105 #include "termchar.h" 103 #include "termchar.h"
106 #include "termopts.h" 104 #include "termopts.h"
107 #include "dispextern.h" 105 #include "dispextern.h"
108 #include "process.h" 106 #include "process.h"
109 #include "cm.h" /* for reset_sys_modes */ 107 #include "cm.h" /* for reset_sys_modes */
110 108 #ifdef HAVE_TERM_H
111 /* For serial_configure and serial_open. */ 109 /* Include this last. If it is ncurses header file, it adds a lot of
112 extern Lisp_Object QCport, QCspeed, QCprocess; 110 defines that interfere with stuff in other headers. Someone responsible
113 extern Lisp_Object QCbytesize, QCstopbits, QCparity, Qodd, Qeven; 111 for ncurses messed up bigtime. See bug#6812. */
114 extern Lisp_Object QCflowcontrol, Qhw, Qsw, QCsummary; 112 #include <term.h>
113 #endif
115 114
116 #ifdef WINDOWSNT 115 #ifdef WINDOWSNT
117 #include <direct.h> 116 #include <direct.h>
118 /* In process.h which conflicts with the local copy. */ 117 /* In process.h which conflicts with the local copy. */
119 #define _P_WAIT 0 118 #define _P_WAIT 0