Mercurial > hg > xemacs-beta

comparison src/device-tty.c @ 5178:97eb4942aec8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Ben Wing <ben@xemacs.org>
date Mon, 29 Mar 2010 21:28:13 -0500
parents 6c6d78781d59
children 5256fedd50e6 308d34e9f07d
comparison
equal deleted inserted replaced
5177:b785049378e3 5178:97eb4942aec8
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
116 #ifndef NEW_GC 114 #ifndef NEW_GC
117 static void 115 static void
118 free_tty_device_struct (struct device *d) 116 free_tty_device_struct (struct device *d)
119 { 117 {
120 if (d->device_data) 118 if (d->device_data)
121 xfree (d->device_data); 119 {
120 xfree (d->device_data);
121 d->device_data = 0;
122 }
122 } 123 }
123 124
124 static void 125 static void
125 tty_delete_device (struct device *d) 126 tty_delete_device (struct device *d)
126 { 127 {
206 207
207 void 208 void
208 syms_of_device_tty (void) 209 syms_of_device_tty (void)
209 { 210 {
210 #ifdef NEW_GC 211 #ifdef NEW_GC
211 INIT_LRECORD_IMPLEMENTATION (tty_device); 212 INIT_LISP_OBJECT (tty_device);
212 #endif /* NEW_GC */ 213 #endif /* NEW_GC */
213 214
214 DEFSYMBOL (Qmake_device_early_tty_entry_point); 215 DEFSYMBOL (Qmake_device_early_tty_entry_point);
215 } 216 }
216 217