From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 15 Mar 2000 11:47:46 +0000 (+0000)
Subject: [__GO32__]: Include <pc.h> only if HAVE_SELECT is undefined.
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=992d0af0616c67c825bd89ca79095c37d1a2acfd;p=deliverable%2Fbinutils-gdb.git

[__GO32__]: Include <pc.h> only if HAVE_SELECT is undefined.
(rl_unget_char, rl_getc) [__GO32__]: Use the go32-specific code only if
HAVE_SELECT is undefined.
---

diff --git a/readline/input.c b/readline/input.c
index 3b48483d26..a8ba23c3c4 100644
--- 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. */