Mercurial > hg > xemacs-beta
comparison src/console-tty.c @ 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 | 71ee43b8a74d |
comparison
equal
deleted
inserted
replaced
5113:b2dcf6a6d8ab | 5133:444a448b2f53 |
---|---|
58 { XD_LISP_OBJECT, offsetof (struct tty_console, outstream) }, | 58 { XD_LISP_OBJECT, offsetof (struct tty_console, outstream) }, |
59 { XD_END } | 59 { XD_END } |
60 }; | 60 }; |
61 | 61 |
62 #ifdef NEW_GC | 62 #ifdef NEW_GC |
63 DEFINE_LRECORD_IMPLEMENTATION ("tty-console", tty_console, | 63 DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT ("tty-console", tty_console, |
64 1, /*dumpable-flag*/ | 64 0, tty_console_data_description_1, |
65 0, 0, 0, 0, 0, | 65 Lisp_Tty_Console); |
66 tty_console_data_description_1, | |
67 Lisp_Tty_Console); | |
68 #else /* not NEW_GC */ | 66 #else /* not NEW_GC */ |
69 const struct sized_memory_description tty_console_data_description = { | 67 const struct sized_memory_description tty_console_data_description = { |
70 sizeof (struct tty_console), tty_console_data_description_1 | 68 sizeof (struct tty_console), tty_console_data_description_1 |
71 }; | 69 }; |
72 #endif /* not NEW_GC */ | 70 #endif /* not NEW_GC */ |
75 static void | 73 static void |
76 allocate_tty_console_struct (struct console *con) | 74 allocate_tty_console_struct (struct console *con) |
77 { | 75 { |
78 /* zero out all slots except the lisp ones ... */ | 76 /* zero out all slots except the lisp ones ... */ |
79 #ifdef NEW_GC | 77 #ifdef NEW_GC |
80 CONSOLE_TTY_DATA (con) = alloc_lrecord_type (struct tty_console, | 78 CONSOLE_TTY_DATA (con) = XTTY_CONSOLE (ALLOC_NORMAL_LISP_OBJECT (tty_console)); |
81 &lrecord_tty_console); | |
82 #else /* not NEW_GC */ | 79 #else /* not NEW_GC */ |
83 CONSOLE_TTY_DATA (con) = xnew_and_zero (struct tty_console); | 80 CONSOLE_TTY_DATA (con) = xnew_and_zero (struct tty_console); |
84 #endif /* not NEW_GC */ | 81 #endif /* not NEW_GC */ |
85 CONSOLE_TTY_DATA (con)->terminal_type = Qnil; | 82 CONSOLE_TTY_DATA (con)->terminal_type = Qnil; |
86 CONSOLE_TTY_DATA (con)->instream = Qnil; | 83 CONSOLE_TTY_DATA (con)->instream = Qnil; |