Mercurial > hg > xemacs-beta
comparison src/device-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 | 6c6d78781d59 |
comparison
equal
deleted
inserted
replaced
5113:b2dcf6a6d8ab | 5133:444a448b2f53 |
---|---|
47 #ifdef NEW_GC | 47 #ifdef NEW_GC |
48 static const struct memory_description tty_device_data_description_1 [] = { | 48 static const struct memory_description tty_device_data_description_1 [] = { |
49 { XD_END } | 49 { XD_END } |
50 }; | 50 }; |
51 | 51 |
52 DEFINE_LRECORD_IMPLEMENTATION ("tty-device", tty_device, | 52 DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT ("tty-device", tty_device, |
53 1, /*dumpable-flag*/ | 53 0, tty_device_data_description_1, |
54 0, 0, 0, 0, 0, | 54 Lisp_Tty_Device); |
55 tty_device_data_description_1, | |
56 Lisp_Tty_Device); | |
57 #endif /* NEW_GC */ | 55 #endif /* NEW_GC */ |
58 | 56 |
59 static void | 57 static void |
60 allocate_tty_device_struct (struct device *d) | 58 allocate_tty_device_struct (struct device *d) |
61 { | 59 { |
62 #ifdef NEW_GC | 60 #ifdef NEW_GC |
63 d->device_data = alloc_lrecord_type (struct tty_device, &lrecord_tty_device); | 61 d->device_data = XTTY_DEVICE (ALLOC_NORMAL_LISP_OBJECT (tty_device)); |
64 #else /* not NEW_GC */ | 62 #else /* not NEW_GC */ |
65 d->device_data = xnew_and_zero (struct tty_device); | 63 d->device_data = xnew_and_zero (struct tty_device); |
66 #endif /* not NEW_GC */ | 64 #endif /* not NEW_GC */ |
67 } | 65 } |
68 | 66 |
206 | 204 |
207 void | 205 void |
208 syms_of_device_tty (void) | 206 syms_of_device_tty (void) |
209 { | 207 { |
210 #ifdef NEW_GC | 208 #ifdef NEW_GC |
211 INIT_LRECORD_IMPLEMENTATION (tty_device); | 209 INIT_LISP_OBJECT (tty_device); |
212 #endif /* NEW_GC */ | 210 #endif /* NEW_GC */ |
213 | 211 |
214 DEFSYMBOL (Qmake_device_early_tty_entry_point); | 212 DEFSYMBOL (Qmake_device_early_tty_entry_point); |
215 } | 213 } |
216 | 214 |