comparison src/objects-tty.c @ 4117:229bd619740a

[xemacs-hg @ 2007-08-15 11:06:02 by crestani] 2007-08-15 Marcus Crestani <crestani@xemacs.org> * buffer.c (Fkill_buffer): * console-tty.c (free_tty_console_struct): * device-gtk.c (free_gtk_device_struct): * device-msw.c (mswindows_delete_device): * device-msw.c (msprinter_delete_device): * device-x.c (free_x_device_struct): * device-x.c (x_delete_device): * dynarr.c (Dynarr_lisp_realloc): * dynarr.c (Dynarr_free): * elhash.c: * elhash.c (finalize_hash_table): * elhash.c (resize_hash_table): * elhash.c (pdump_reorganize_hash_table): * extents.c (gap_array_delete_marker): * frame-gtk.c (gtk_delete_frame): * frame-msw.c (mswindows_delete_frame): * frame-x.c (x_delete_frame): * glyphs.c (check_for_ignored_expose): * mc-alloc.c (mc_realloc_1): * mc-alloc.h: * objects-tty.c (tty_finalize_color_instance): * objects-tty.c (tty_finalize_font_instance): * objects-tty.c (console_type_create_objects_tty): * syntax.c: * syntax.c (uninit_buffer_syntax_cache): * vdb.c (Ftest_vdb): Remove all calls to mc_free.
author crestani
date Wed, 15 Aug 2007 11:06:10 +0000
parents 5989b9bbb612
children 9a633a00c3f2
comparison
equal deleted inserted replaced
4116:9a42c5e5eb4e 4117:229bd619740a
216 Lisp_Object UNUSED (printcharfun), 216 Lisp_Object UNUSED (printcharfun),
217 int UNUSED (escapeflag)) 217 int UNUSED (escapeflag))
218 { 218 {
219 } 219 }
220 220
221 #ifndef NEW_GC
221 static void 222 static void
222 tty_finalize_color_instance (Lisp_Color_Instance *c) 223 tty_finalize_color_instance (Lisp_Color_Instance *c)
223 { 224 {
224 if (c->data) 225 if (c->data)
225 #ifdef NEW_GC
226 mc_free (c->data);
227 #else /* not NEW_GC */
228 xfree (c->data, void *); 226 xfree (c->data, void *);
229 #endif /* not NEW_GC */ 227 }
230 } 228 #endif /* not NEW_GC */
231 229
232 static int 230 static int
233 tty_color_instance_equal (Lisp_Color_Instance *c1, 231 tty_color_instance_equal (Lisp_Color_Instance *c1,
234 Lisp_Color_Instance *c2, 232 Lisp_Color_Instance *c2,
235 int UNUSED (depth)) 233 int UNUSED (depth))
313 Lisp_Object UNUSED (printcharfun), 311 Lisp_Object UNUSED (printcharfun),
314 int UNUSED (escapeflag)) 312 int UNUSED (escapeflag))
315 { 313 {
316 } 314 }
317 315
316 #ifndef NEW_GC
318 static void 317 static void
319 tty_finalize_font_instance (Lisp_Font_Instance *f) 318 tty_finalize_font_instance (Lisp_Font_Instance *f)
320 { 319 {
321 if (f->data) 320 if (f->data)
322 #ifdef NEW_GC
323 mc_free (f->data);
324 #else /* not NEW_GC */
325 xfree (f->data, void *); 321 xfree (f->data, void *);
326 #endif /* not NEW_GC */ 322 }
327 } 323 #endif /* not NEW_GC */
328 324
329 static Lisp_Object 325 static Lisp_Object
330 tty_font_list (Lisp_Object UNUSED (pattern), Lisp_Object UNUSED (device), 326 tty_font_list (Lisp_Object UNUSED (pattern), Lisp_Object UNUSED (device),
331 Lisp_Object UNUSED (maxnumber)) 327 Lisp_Object UNUSED (maxnumber))
332 { 328 {
419 { 415 {
420 /* object methods */ 416 /* object methods */
421 CONSOLE_HAS_METHOD (tty, initialize_color_instance); 417 CONSOLE_HAS_METHOD (tty, initialize_color_instance);
422 CONSOLE_HAS_METHOD (tty, mark_color_instance); 418 CONSOLE_HAS_METHOD (tty, mark_color_instance);
423 CONSOLE_HAS_METHOD (tty, print_color_instance); 419 CONSOLE_HAS_METHOD (tty, print_color_instance);
420 #ifndef NEW_GC
424 CONSOLE_HAS_METHOD (tty, finalize_color_instance); 421 CONSOLE_HAS_METHOD (tty, finalize_color_instance);
422 #endif /* not NEW_GC */
425 CONSOLE_HAS_METHOD (tty, color_instance_equal); 423 CONSOLE_HAS_METHOD (tty, color_instance_equal);
426 CONSOLE_HAS_METHOD (tty, color_instance_hash); 424 CONSOLE_HAS_METHOD (tty, color_instance_hash);
427 CONSOLE_HAS_METHOD (tty, valid_color_name_p); 425 CONSOLE_HAS_METHOD (tty, valid_color_name_p);
428 CONSOLE_HAS_METHOD (tty, color_list); 426 CONSOLE_HAS_METHOD (tty, color_list);
429 427
430 CONSOLE_HAS_METHOD (tty, initialize_font_instance); 428 CONSOLE_HAS_METHOD (tty, initialize_font_instance);
431 CONSOLE_HAS_METHOD (tty, mark_font_instance); 429 CONSOLE_HAS_METHOD (tty, mark_font_instance);
432 CONSOLE_HAS_METHOD (tty, print_font_instance); 430 CONSOLE_HAS_METHOD (tty, print_font_instance);
431 #ifndef NEW_GC
433 CONSOLE_HAS_METHOD (tty, finalize_font_instance); 432 CONSOLE_HAS_METHOD (tty, finalize_font_instance);
433 #endif /* not NEW_GC */
434 CONSOLE_HAS_METHOD (tty, font_list); 434 CONSOLE_HAS_METHOD (tty, font_list);
435 #ifdef MULE 435 #ifdef MULE
436 CONSOLE_HAS_METHOD (tty, font_spec_matches_charset); 436 CONSOLE_HAS_METHOD (tty, font_spec_matches_charset);
437 CONSOLE_HAS_METHOD (tty, find_charset_font); 437 CONSOLE_HAS_METHOD (tty, find_charset_font);
438 #endif 438 #endif