X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fevent-unixoid.c;h=9033ebf422f46295d0538bad1426c0b8e54ca4bf;hb=82da33b61c3e2dd2937db17b75b2838188793053;hp=072ac61a0779123e0bbf4eba018b9fd470abea39;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git-

diff --git a/src/event-unixoid.c b/src/event-unixoid.c
index 072ac61..9033ebf 100644
--- a/src/event-unixoid.c
+++ b/src/event-unixoid.c
@@ -41,10 +41,6 @@ Boston, MA 02111-1307, USA.  */
 #include "sysproc.h"		/* select stuff */
 #include "systime.h"
 
-#ifdef HAVE_GPM
-#include "gpmevent.h"
-#endif
-
 /* Mask of bits indicating the descriptors that we wait for input on.
    These work as follows:
 
@@ -84,12 +80,6 @@ read_event_from_tty_or_stream_desc (struct Lisp_Event *event,
 
   XSETCONSOLE (console, con);
 
-#ifdef HAVE_GPM
-  if (fd == CONSOLE_TTY_MOUSE_FD (con)) {
-    return handle_gpm_read (event,con,fd);
-  }
-#endif
-
   nread = read (fd, &ch, 1);
   if (nread <= 0)
     {
@@ -147,7 +137,7 @@ event_stream_unixoid_select_console (struct console *con)
   int infd;
 
   if (CONSOLE_STREAM_P (con))
-    infd = fileno (CONSOLE_STREAM_DATA (con)->infd);
+    infd = fileno (CONSOLE_STREAM_DATA (con)->in);
   else
     {
       assert (CONSOLE_TTY_P (con));
@@ -168,7 +158,7 @@ event_stream_unixoid_unselect_console (struct console *con)
   int infd;
 
   if (CONSOLE_STREAM_P (con))
-    infd = fileno (CONSOLE_STREAM_DATA (con)->infd);
+    infd = fileno (CONSOLE_STREAM_DATA (con)->in);
   else
     {
       assert (CONSOLE_TTY_P (con));