2000-03-27 Elena Zannoni <ezannoni@kwikemart.cygnus.com>

[deliverable/binutils-gdb.git] / readline / input.c

diff --git a/readline/input.c b/readline/input.c
index 3b48483d2625a705d8ddd1c8186cdcc6f48b34fd..a8ba23c3c43717fb0ddf1933a93b3ef0487b7986 100644 (file)
--- a/readline/input.c
+++ b/readline/input.c
@@ -96,7 +96,7 @@ extern Keymap _rl_keymap;
 
 extern int _rl_convert_meta_chars_to_ascii;
 
-#if defined (__GO32__)
+#if defined (__GO32__) && !defined (HAVE_SELECT)
 #  include <pc.h>
 #endif /* __GO32__ */
 
@@ -176,7 +176,7 @@ rl_unget_char (key)
 static void
 rl_gather_tyi ()
 {
-#if defined (__GO32__)
+#if defined (__GO32__) && !defined (HAVE_SELECT)
   char input;
 
   if (isatty (0) && kbhit () && ibuffer_space ())
@@ -397,7 +397,7 @@ rl_getc (stream)
   int result, flags;
   unsigned char c;
 
-#if defined (__GO32__)
+#if defined (__GO32__) && !defined (HAVE_TERMIOS_H)
   if (isatty (0))
     return (getkey () & 0x7F);
 #endif /* __GO32__ */
@@ -448,7 +448,7 @@ rl_getc (stream)
        }
 #endif /* _POSIX_VERSION && EAGAIN && O_NONBLOCK */
 
-#if !defined (__GO32__)
+#if !defined (__GO32__) || defined (HAVE_TERMIOS_H)
       /* If the error that we received was SIGINT, then try again,
         this is simply an interrupted system call to read ().
         Otherwise, some error ocurred, also signifying EOF. */