comparison src/objects-tty.c @ 5120:d1247f3cc363 ben-lisp-object

latest work on lisp-object workspace; more changes eliminating LCRECORD in place of LISP_OBJECT; now compiles and runs.
author Ben Wing <ben@xemacs.org>
date Mon, 28 Dec 2009 01:15:52 -0600
parents e0db3c197671
children b5df3737028a
comparison
equal deleted inserted replaced
5119:d877c14318b3 5120:d1247f3cc363
195 return 0; 195 return 0;
196 } 196 }
197 197
198 /* Don't allocate the data until we're sure that we will succeed. */ 198 /* Don't allocate the data until we're sure that we will succeed. */
199 #ifdef NEW_GC 199 #ifdef NEW_GC
200 c->data = alloc_lrecord_type (struct tty_color_instance_data, 200 c->data =
201 &lrecord_tty_color_instance_data); 201 XTTY_COLOR_INSTANCE_DATA (ALLOC_LISP_OBJECT (tty_color_instance_data));
202 #else /* not NEW_GC */ 202 #else /* not NEW_GC */
203 c->data = xnew (struct tty_color_instance_data); 203 c->data = xnew (struct tty_color_instance_data);
204 #endif /* not NEW_GC */ 204 #endif /* not NEW_GC */
205 COLOR_INSTANCE_TTY_SYMBOL (c) = name; 205 COLOR_INSTANCE_TTY_SYMBOL (c) = name;
206 206
280 #endif 280 #endif
281 } 281 }
282 282
283 /* Don't allocate the data until we're sure that we will succeed. */ 283 /* Don't allocate the data until we're sure that we will succeed. */
284 #ifdef NEW_GC 284 #ifdef NEW_GC
285 f->data = alloc_lrecord_type (struct tty_font_instance_data, 285 f->data =
286 &lrecord_tty_font_instance_data); 286 XTTY_FONT_INSTANCE_DATA (ALLOC_LISP_OBJECT (tty_font_instance_data));
287 #else /* not NEW_GC */ 287 #else /* not NEW_GC */
288 f->data = xnew (struct tty_font_instance_data); 288 f->data = xnew (struct tty_font_instance_data);
289 #endif /* not NEW_GC */ 289 #endif /* not NEW_GC */
290 FONT_INSTANCE_TTY_CHARSET (f) = charset; 290 FONT_INSTANCE_TTY_CHARSET (f) = charset;
291 #ifdef MULE 291 #ifdef MULE