update.

[chise/xemacs-chise.git-] / src / console-tty.h

diff --git a/src/console-tty.h b/src/console-tty.h
index 3b88295..024eaf5 100644 (file)
--- a/src/console-tty.h
+++ b/src/console-tty.h
@@ -29,8 +29,8 @@ Boston, MA 02111-1307, USA.  */
    have more than one device on a TTY console, the output stuff
    will have to get separated out. */
 
-#ifndef _XEMACS_CONSOLE_TTY_H_
-#define _XEMACS_CONSOLE_TTY_H_
+#ifndef INCLUDED_console_tty_h_
+#define INCLUDED_console_tty_h_
 
 #include "console.h"
 #include "syssignal.h" /* Always include before systty.h */
@@ -41,9 +41,6 @@ DECLARE_CONSOLE_TYPE (tty);
 struct tty_console
 {
   int infd, outfd;
-#ifdef HAVE_GPM
-  int mouse_fd;
-#endif
   Lisp_Object instream, outstream;
   Lisp_Object terminal_type;
   Lisp_Object controlling_process;
@@ -203,9 +200,6 @@ struct tty_console
   unsigned int is_stdio :1;
 };
 
-#ifdef HAVE_GPM
-#define CONSOLE_TTY_MOUSE_FD(c) (CONSOLE_TTY_DATA (c)->mouse_fd)
-#endif
 #define CONSOLE_TTY_DATA(c) CONSOLE_TYPE_DATA (c, tty)
 #define CONSOLE_TTY_CURSOR_X(c) (CONSOLE_TTY_DATA (c)->cursor_x)
 #define CONSOLE_TTY_CURSOR_Y(c) (CONSOLE_TTY_DATA (c)->cursor_y)
@@ -293,5 +287,6 @@ Lisp_Object tty_semi_canonicalize_device_connection (Lisp_Object connection,
                                                     Error_behavior errb);
 Lisp_Object tty_canonicalize_device_connection (Lisp_Object connection,
                                                Error_behavior errb);
+struct console * tty_find_console_from_fd (int fd);
 
-#endif /* _XEMACS_CONSOLE_TTY_H_ */
+#endif /* INCLUDED_console_tty_h_ */