diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2000-03-15 11:57:42 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2000-03-15 11:57:42 +0000 |
| commit | 410913b1c5b31c96552bccda8550cbb7b1d23694 (patch) | |
| tree | 3cdcc1b7d4003c9d7ff96ead7bc4fe15e25fa695 | |
| parent | a44289013674874b517fa8959043330e962800db (diff) | |
| download | binutils-410913b1c5b31c96552bccda8550cbb7b1d23694.zip binutils-410913b1c5b31c96552bccda8550cbb7b1d23694.tar.gz binutils-410913b1c5b31c96552bccda8550cbb7b1d23694.tar.bz2 | |
[__GO32__]: Don't undef HANDLE_SIGNALS if __DJGPP__ is defined.
(prepare_terminal_settings, rl_prep_terminal, rl_deprep_terminal)
[__GO32__]: Don't bypass termios code if HAVE_TERMIOS_H is defined.
| -rw-r--r-- | readline/rltty.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/readline/rltty.c b/readline/rltty.c index 2c7e886..08cd85b 100644 --- a/readline/rltty.c +++ b/readline/rltty.c @@ -57,7 +57,9 @@ extern void _rl_control_keypad (); #if defined (__GO32__) # include <pc.h> -# undef HANDLE_SIGNALS +# if !defined (__DJGPP__) +# undef HANDLE_SIGNALS +# endif /* !__DJGPP__ */ #endif /* __GO32__ */ /* Indirect functions to allow apps control over terminal management. */ @@ -260,7 +262,7 @@ prepare_terminal_settings (meta_flag, otio, tiop) int meta_flag; TIOTYPE otio, *tiop; { -#if !defined (__GO32__) +#if !defined (__GO32__) || defined (HAVE_TERMIOS_H) readline_echoing_p = (otio.sgttyb.sg_flags & ECHO); /* Copy the original settings to the structure we're going to use for @@ -326,7 +328,7 @@ prepare_terminal_settings (meta_flag, otio, tiop) tiop->ltchars.t_dsuspc = -1; /* C-y */ tiop->ltchars.t_lnextc = -1; /* C-v */ #endif /* TIOCGLTC */ -#endif /* !__GO32__ */ +#endif /* !__GO32__ || HAVE_TERMIOS_H */ } #else /* !defined (NEW_TTY_DRIVER) */ @@ -524,7 +526,7 @@ void rl_prep_terminal (meta_flag) int meta_flag; { -#if !defined (__GO32__) +#if !defined (__GO32__) || defined (HAVE_TERMIOS_H) int tty; TIOTYPE tio; @@ -559,14 +561,14 @@ rl_prep_terminal (meta_flag) terminal_prepped = 1; release_sigint (); -#endif /* !__GO32__ */ +#endif /* !__GO32__ || HAVE_TERMIOS_H */ } /* Restore the terminal's normal settings and modes. */ void rl_deprep_terminal () { -#if !defined (__GO32__) +#if !defined (__GO32__) || defined (HAVE_TERMIOS_H) int tty; if (!terminal_prepped) @@ -591,7 +593,7 @@ rl_deprep_terminal () terminal_prepped = 0; release_sigint (); -#endif /* !__GO32__ */ +#endif /* !__GO32__ || HAVE_TERMIOS_H */ } /* **************************************************************** */ |