comparison src/console-stream-impl.h @ 5118:e0db3c197671 ben-lisp-object

merge up to latest default branch, doesn't compile yet
author Ben Wing <ben@xemacs.org>
date Sat, 26 Dec 2009 21:18:49 -0600
parents 141c2920ea48
children d1247f3cc363
comparison
equal deleted inserted replaced
5117:3742ea8250b5 5118:e0db3c197671
32 32
33 DECLARE_CONSOLE_TYPE (stream); 33 DECLARE_CONSOLE_TYPE (stream);
34 34
35 struct stream_console 35 struct stream_console
36 { 36 {
37 #ifdef NEW_GC
38 struct lrecord_header header;
39 #endif /* NEW_GC */
37 FILE *in; 40 FILE *in;
38 FILE *out; 41 FILE *out;
39 FILE *err; 42 FILE *err;
40 int needs_newline; 43 int needs_newline;
41 Lisp_Object instream; 44 Lisp_Object instream;
42 }; 45 };
43 46
47 #ifdef NEW_GC
48 typedef struct stream_console Lisp_Stream_Console;
49
50 DECLARE_LISP_OBJECT (stream_console, Lisp_Stream_Console);
51
52 #define XSTREAM_CONSOLE(x) \
53 XRECORD (x, stream_console, Lisp_Stream_Console)
54 #define wrap_stream_console(p) wrap_record (p, stream_console)
55 #define STREAM_CONSOLE_P(x) RECORDP (x, stream_console)
56 #endif /* NEW_GC */
57
44 #define CONSOLE_STREAM_DATA(con) CONSOLE_TYPE_DATA (con, stream) 58 #define CONSOLE_STREAM_DATA(con) CONSOLE_TYPE_DATA (con, stream)
45 59
46 #endif /* INCLUDED_console_stream_impl_h_ */ 60 #endif /* INCLUDED_console_stream_impl_h_ */