Mercurial > hg > xemacs-beta

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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
line wrap: on
line diff
--- a/src/objects-tty.c	Tue Aug 14 21:51:16 2007 +0000
+++ b/src/objects-tty.c	Wed Aug 15 11:06:10 2007 +0000
@@ -218,16 +218,14 @@
 {
 }
 
+#ifndef NEW_GC
 static void
 tty_finalize_color_instance (Lisp_Color_Instance *c)
 {
   if (c->data)
-#ifdef NEW_GC
-    mc_free (c->data);
-#else /* not NEW_GC */
     xfree (c->data, void *);
+}
 #endif /* not NEW_GC */
-}
 
 static int
 tty_color_instance_equal (Lisp_Color_Instance *c1,
@@ -315,16 +313,14 @@
 {
 }
 
+#ifndef NEW_GC
 static void
 tty_finalize_font_instance (Lisp_Font_Instance *f)
 {
   if (f->data)
-#ifdef NEW_GC
-    mc_free (f->data);
-#else /* not NEW_GC */
     xfree (f->data, void *);
+}
 #endif /* not NEW_GC */
-}
 
 static Lisp_Object
 tty_font_list (Lisp_Object UNUSED (pattern), Lisp_Object UNUSED (device),
@@ -421,7 +417,9 @@
   CONSOLE_HAS_METHOD (tty, initialize_color_instance);
   CONSOLE_HAS_METHOD (tty, mark_color_instance);
   CONSOLE_HAS_METHOD (tty, print_color_instance);
+#ifndef NEW_GC
   CONSOLE_HAS_METHOD (tty, finalize_color_instance);
+#endif /* not NEW_GC */
   CONSOLE_HAS_METHOD (tty, color_instance_equal);
   CONSOLE_HAS_METHOD (tty, color_instance_hash);
   CONSOLE_HAS_METHOD (tty, valid_color_name_p);
@@ -430,7 +428,9 @@
   CONSOLE_HAS_METHOD (tty, initialize_font_instance);
   CONSOLE_HAS_METHOD (tty, mark_font_instance);
   CONSOLE_HAS_METHOD (tty, print_font_instance);
+#ifndef NEW_GC
   CONSOLE_HAS_METHOD (tty, finalize_font_instance);
+#endif /* not NEW_GC */
   CONSOLE_HAS_METHOD (tty, font_list);
 #ifdef MULE
   CONSOLE_HAS_METHOD (tty, font_spec_matches_charset);