Mercurial > hg > xemacs-beta

comparison src/console-stream.c @ 5140:e5380fdaf8f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Ben Wing <ben@xemacs.org>
date Sat, 13 Mar 2010 05:38:34 -0600
parents 7be849cb8828
children 308d34e9f07d
comparison
equal deleted inserted replaced
5139:a48ef26d87ee 5140:e5380fdaf8f1
52 { XD_LISP_OBJECT, offsetof (struct stream_console, instream) }, 52 { XD_LISP_OBJECT, offsetof (struct stream_console, instream) },
53 { XD_END } 53 { XD_END }
54 }; 54 };
55 55
56 #ifdef NEW_GC 56 #ifdef NEW_GC
57 DEFINE_LRECORD_IMPLEMENTATION ("stream-console", stream_console, 57 DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT ("stream-console", stream_console,
58 1, /*dumpable-flag*/ 58 0, stream_console_data_description_1,
59 0, 0, 0, 0, 0, 59 Lisp_Stream_Console);
60 stream_console_data_description_1,
61 Lisp_Stream_Console);
62 #else /* not NEW_GC */ 60 #else /* not NEW_GC */
63 const struct sized_memory_description stream_console_data_description = { 61 const struct sized_memory_description stream_console_data_description = {
64 sizeof (struct stream_console), stream_console_data_description_1 62 sizeof (struct stream_console), stream_console_data_description_1
65 }; 63 };
66 #endif /* not NEW_GC */ 64 #endif /* not NEW_GC */
71 Lisp_Object tty = CONSOLE_CONNECTION (con); 69 Lisp_Object tty = CONSOLE_CONNECTION (con);
72 struct stream_console *stream_con; 70 struct stream_console *stream_con;
73 71
74 #ifdef NEW_GC 72 #ifdef NEW_GC
75 if (CONSOLE_STREAM_DATA (con) == NULL) 73 if (CONSOLE_STREAM_DATA (con) == NULL)
76 CONSOLE_STREAM_DATA (con) = alloc_lrecord_type (struct stream_console, 74 CONSOLE_STREAM_DATA (con) =
77 &lrecord_stream_console); 75 XSTREAM_CONSOLE (ALLOC_NORMAL_LISP_OBJECT (stream_console));
78 #else /* not NEW_GC */ 76 #else /* not NEW_GC */
79 if (CONSOLE_STREAM_DATA (con) == NULL) 77 if (CONSOLE_STREAM_DATA (con) == NULL)
80 CONSOLE_STREAM_DATA (con) = xnew_and_zero (struct stream_console); 78 CONSOLE_STREAM_DATA (con) = xnew_and_zero (struct stream_console);
81 #endif /* not NEW_GC */ 79 #endif /* not NEW_GC */
82 80