Contents in 1999-06-04-13 of release-21-2.

[chise/xemacs-chise.git.1] / src / console-tty.c

diff --git a/src/console-tty.c b/src/console-tty.c
index f4196b8..ec63358 100644 (file)
--- a/src/console-tty.c
+++ b/src/console-tty.c
@@ -32,7 +32,6 @@ Boston, MA 02111-1307, USA.  */
 #include "faces.h"
 #include "frame.h"
 #include "lstream.h"
-#include "redisplay.h"
 #include "sysdep.h"
 #include "sysfile.h"
 #ifdef FILE_CODING
@@ -165,9 +164,9 @@ static void
 tty_mark_console (struct console *con, void (*markobj) (Lisp_Object))
 {
   struct tty_console *tty_con = CONSOLE_TTY_DATA (con);
-  ((markobj) (tty_con->terminal_type));
-  ((markobj) (tty_con->instream));
-  ((markobj) (tty_con->outstream));
+  markobj (tty_con->terminal_type);
+  markobj (tty_con->instream);
+  markobj (tty_con->outstream);
 }
 
 static int
@@ -234,7 +233,7 @@ Return the controlling process of tty console CONSOLE.
   return CONSOLE_TTY_DATA (decode_tty_console (console))->controlling_process;
 }
 
-#ifdef MULE
+#ifdef FILE_CODING
 \f
 DEFUN ("console-tty-input-coding-system", Fconsole_tty_input_coding_system,
        0, 1, 0, /*
@@ -299,7 +298,7 @@ output coding systems of CONSOLE.
   Fset_console_tty_output_coding_system (console, codesys);
   return Qnil;
 }
-#endif /* MULE */
+#endif /* FILE_CODING */
 \f
 
 Lisp_Object
@@ -342,13 +341,13 @@ syms_of_console_tty (void)
   DEFSUBR (Fconsole_tty_controlling_process);
   defsymbol (&Qterminal_type, "terminal-type");
   defsymbol (&Qcontrolling_process, "controlling-process");
-#ifdef MULE
+#ifdef FILE_CODING
   DEFSUBR (Fconsole_tty_output_coding_system);
   DEFSUBR (Fset_console_tty_output_coding_system);
   DEFSUBR (Fconsole_tty_input_coding_system);
   DEFSUBR (Fset_console_tty_input_coding_system);
   DEFSUBR (Fset_console_tty_coding_system);
-#endif /* MULE */
+#endif /* FILE_CODING */
 }
 
 void