From c59116b15d95a94a9a2dd8ce5fe08850e004411a Mon Sep 17 00:00:00 2001 From: Chet Ramey Date: Fri, 17 Nov 2023 16:02:46 -0500 Subject: Readline-8.2 patch 4: fix compilation on systems that provide select or pselect but not both --- input.c | 6 ++++-- patchlevel | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/input.c b/input.c index 6f038d4..68d418c 100644 --- a/input.c +++ b/input.c @@ -151,7 +151,9 @@ int rl_timeout_remaining (unsigned int *, unsigned int *); int _rl_timeout_init (void); int _rl_timeout_sigalrm_handler (void); +#if defined (RL_TIMEOUT_USE_SELECT) int _rl_timeout_select (int, fd_set *, fd_set *, fd_set *, const struct timeval *, const sigset_t *); +#endif static void _rl_timeout_handle (void); #if defined (RL_TIMEOUT_USE_SIGALRM) @@ -248,7 +250,7 @@ rl_gather_tyi (void) register int tem, result; int chars_avail, k; char input; -#if defined(HAVE_SELECT) +#if defined (HAVE_PSELECT) || defined (HAVE_SELECT) fd_set readfds, exceptfds; struct timeval timeout; #endif @@ -805,7 +807,7 @@ rl_getc (FILE *stream) int result; unsigned char c; int fd; -#if defined (HAVE_PSELECT) +#if defined (HAVE_PSELECT) || defined (HAVE_SELECT) sigset_t empty_set; fd_set readfds; #endif diff --git a/patchlevel b/patchlevel index ce3e355..626a945 100644 --- a/patchlevel +++ b/patchlevel @@ -1,3 +1,3 @@ # Do not edit -- exists only for use by patch -3 +4 -- cgit v1.2.3-70-g09d2