Mercurial > hg > xemacs-beta
diff src/device-tty.c @ 5178:97eb4942aec8
merge
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Mon, 29 Mar 2010 21:28:13 -0500 |
| parents | 6c6d78781d59 |
| children | 5256fedd50e6 308d34e9f07d |
line wrap: on
line diff
--- a/src/device-tty.c Tue Feb 23 07:28:35 2010 -0600 +++ b/src/device-tty.c Mon Mar 29 21:28:13 2010 -0500 @@ -49,18 +49,16 @@ { XD_END } }; -DEFINE_LRECORD_IMPLEMENTATION ("tty-device", tty_device, - 1, /*dumpable-flag*/ - 0, 0, 0, 0, 0, - tty_device_data_description_1, - Lisp_Tty_Device); +DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT ("tty-device", tty_device, + 0, tty_device_data_description_1, + Lisp_Tty_Device); #endif /* NEW_GC */ static void allocate_tty_device_struct (struct device *d) { #ifdef NEW_GC - d->device_data = alloc_lrecord_type (struct tty_device, &lrecord_tty_device); + d->device_data = XTTY_DEVICE (ALLOC_NORMAL_LISP_OBJECT (tty_device)); #else /* not NEW_GC */ d->device_data = xnew_and_zero (struct tty_device); #endif /* not NEW_GC */ @@ -118,7 +116,10 @@ free_tty_device_struct (struct device *d) { if (d->device_data) - xfree (d->device_data); + { + xfree (d->device_data); + d->device_data = 0; + } } static void @@ -208,7 +209,7 @@ syms_of_device_tty (void) { #ifdef NEW_GC - INIT_LRECORD_IMPLEMENTATION (tty_device); + INIT_LISP_OBJECT (tty_device); #endif /* NEW_GC */ DEFSYMBOL (Qmake_device_early_tty_entry_point);