diff src/console-tty.c @ 4990:8f0cf4fd3d2c

Automatic merge
author Ben Wing <ben@xemacs.org>
date Sat, 06 Feb 2010 04:01:46 -0600
parents 16112448d484
children b5df3737028a
line wrap: on
line diff
--- a/src/console-tty.c	Sat Feb 06 03:59:18 2010 -0600
+++ b/src/console-tty.c	Sat Feb 06 04:01:46 2010 -0600
@@ -114,7 +114,7 @@
 	  invalid_state ("Cannot determine terminal type", Qunbound);
 	}
       else
-	terminal_type = build_intstring (temp_type);
+	terminal_type = build_istring (temp_type);
     }
 
   /* Determine the controlling process */
@@ -216,11 +216,11 @@
     {
       if (tty_con->term_entry_buffer) /* allocated in term_init () */
 	{
-	  xfree (tty_con->term_entry_buffer, char *);
+	  xfree (tty_con->term_entry_buffer);
 	  tty_con->term_entry_buffer = NULL;
 	}
 #ifndef NEW_GC
-      xfree (tty_con, struct tty_console *);
+      xfree (tty_con);
 #endif /* not NEW_GC */
       CONSOLE_TTY_DATA (con) = NULL;
     }