[__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.
This commit is contained in:
Eli Zaretskii 2000-03-15 11:47:46 +00:00
parent 057b35a099
commit 992d0af061

View file

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