Mercurial > hg > xemacs-beta
comparison src/console-tty-impl.h @ 5133:444a448b2f53
Merge branch ben-lisp-object into default branch
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Sun, 07 Mar 2010 06:47:37 -0600 |
parents | a9c41067dd88 |
children | 5256fedd50e6 308d34e9f07d |
comparison
equal
deleted
inserted
replaced
5113:b2dcf6a6d8ab | 5133:444a448b2f53 |
---|---|
38 DECLARE_CONSOLE_TYPE (tty); | 38 DECLARE_CONSOLE_TYPE (tty); |
39 | 39 |
40 struct tty_console | 40 struct tty_console |
41 { | 41 { |
42 #ifdef NEW_GC | 42 #ifdef NEW_GC |
43 struct lrecord_header header; | 43 NORMAL_LISP_OBJECT_HEADER header; |
44 #endif /* NEW_GC */ | 44 #endif /* NEW_GC */ |
45 int infd, outfd; | 45 int infd, outfd; |
46 Lisp_Object instream, outstream; | 46 Lisp_Object instream, outstream; |
47 Lisp_Object terminal_type; | 47 Lisp_Object terminal_type; |
48 Lisp_Object controlling_process; | 48 Lisp_Object controlling_process; |
205 }; | 205 }; |
206 | 206 |
207 #ifdef NEW_GC | 207 #ifdef NEW_GC |
208 typedef struct tty_console Lisp_Tty_Console; | 208 typedef struct tty_console Lisp_Tty_Console; |
209 | 209 |
210 DECLARE_LRECORD (tty_console, Lisp_Tty_Console); | 210 DECLARE_LISP_OBJECT (tty_console, Lisp_Tty_Console); |
211 | 211 |
212 #define XTTY_CONSOLE(x) \ | 212 #define XTTY_CONSOLE(x) \ |
213 XRECORD (x, tty_console, Lisp_Tty_Console) | 213 XRECORD (x, tty_console, Lisp_Tty_Console) |
214 #define wrap_tty_console(p) wrap_record (p, tty_console) | 214 #define wrap_tty_console(p) wrap_record (p, tty_console) |
215 #define TTY_CONSOLE_P(x) RECORDP (x, tty_console) | 215 #define TTY_CONSOLE_P(x) RECORDP (x, tty_console) |
254 } while (0) | 254 } while (0) |
255 | 255 |
256 struct tty_device | 256 struct tty_device |
257 { | 257 { |
258 #ifdef NEW_GC | 258 #ifdef NEW_GC |
259 struct lrecord_header header; | 259 NORMAL_LISP_OBJECT_HEADER header; |
260 #endif /* NEW_GC */ | 260 #endif /* NEW_GC */ |
261 #ifdef HAVE_TERMIOS | 261 #ifdef HAVE_TERMIOS |
262 speed_t ospeed; /* Output speed (from sg_ospeed) */ | 262 speed_t ospeed; /* Output speed (from sg_ospeed) */ |
263 #else | 263 #else |
264 short ospeed; /* Output speed (from sg_ospeed) */ | 264 short ospeed; /* Output speed (from sg_ospeed) */ |
266 }; | 266 }; |
267 | 267 |
268 #ifdef NEW_GC | 268 #ifdef NEW_GC |
269 typedef struct tty_device Lisp_Tty_Device; | 269 typedef struct tty_device Lisp_Tty_Device; |
270 | 270 |
271 DECLARE_LRECORD (tty_device, Lisp_Tty_Device); | 271 DECLARE_LISP_OBJECT (tty_device, Lisp_Tty_Device); |
272 | 272 |
273 #define XTTY_DEVICE(x) \ | 273 #define XTTY_DEVICE(x) \ |
274 XRECORD (x, tty_device, Lisp_Tty_Device) | 274 XRECORD (x, tty_device, Lisp_Tty_Device) |
275 #define wrap_tty_device(p) wrap_record (p, tty_device) | 275 #define wrap_tty_device(p) wrap_record (p, tty_device) |
276 #define TTY_DEVICE_P(x) RECORDP (x, tty_device) | 276 #define TTY_DEVICE_P(x) RECORDP (x, tty_device) |