comparison src/device.c @ 5143:186aebf7f6c6

merge
author Ben Wing <ben@xemacs.org>
date Sat, 13 Mar 2010 11:38:54 -0600
parents f965e31a35f0
children 88bd4f3ef8e4
comparison
equal deleted inserted replaced
5140:e5380fdaf8f1 5143:186aebf7f6c6
158 int UNUSED (escapeflag)) 158 int UNUSED (escapeflag))
159 { 159 {
160 struct device *d = XDEVICE (obj); 160 struct device *d = XDEVICE (obj);
161 161
162 if (print_readably) 162 if (print_readably)
163 printing_unreadable_lcrecord (obj, XSTRING_DATA (d->name)); 163 printing_unreadable_lisp_object (obj, XSTRING_DATA (d->name));
164 164
165 write_fmt_string (printcharfun, "#<%s-device", !DEVICE_LIVE_P (d) ? "dead" : 165 write_fmt_string (printcharfun, "#<%s-device", !DEVICE_LIVE_P (d) ? "dead" :
166 DEVICE_TYPE_NAME (d)); 166 DEVICE_TYPE_NAME (d));
167 if (DEVICE_LIVE_P (d) && !NILP (DEVICE_CONNECTION (d))) 167 if (DEVICE_LIVE_P (d) && !NILP (DEVICE_CONNECTION (d)))
168 write_fmt_string_lisp (printcharfun, " on %S", 1, DEVICE_CONNECTION (d)); 168 write_fmt_string_lisp (printcharfun, " on %S", 1, DEVICE_CONNECTION (d));
169 write_fmt_string (printcharfun, " 0x%x>", d->header.uid); 169 write_fmt_string (printcharfun, " 0x%x>", NORMAL_LISP_OBJECT_UID (d));
170 } 170 }
171 171
172 DEFINE_NODUMP_LISP_OBJECT ("device", device, 172 DEFINE_NODUMP_LISP_OBJECT ("device", device,
173 mark_device, print_device, 0, 0, 0, 173 mark_device, print_device, 0, 0, 0,
174 device_description, 174 device_description,