From: Tom Tromey Date: Sat, 16 Nov 2024 20:43:22 +0000 (-0700) Subject: Fix readline build on mingw X-Git-Tag: gdb-16-branchpoint~81 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=975cb893f45de2a927e226883e7a76ee5e333baa;p=thirdparty%2Fbinutils-gdb.git Fix readline build on mingw Upstream readline 8.2 does not build on mingw. This patch fixes the build, but I do not know how well it works. I've submitted this to readline here: https://lists.gnu.org/archive/html/bug-readline/2024-11/msg00007.html Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=32265 --- diff --git a/readline/readline/input.c b/readline/readline/input.c index f68fcac553c..39bbff1398a 100644 --- a/readline/readline/input.c +++ b/readline/readline/input.c @@ -21,6 +21,13 @@ #define READLINE_LIBRARY +#if defined (__MINGW32__) +/* These are needed to get the declaration of 'alarm' when including + . */ +#define __USE_MINGW_ALARM +#define _POSIX +#endif + #if defined (__TANDEM) # define _XOPEN_SOURCE_EXTENDED 1 # define _TANDEM_SOURCE 1 @@ -834,7 +841,7 @@ rl_getc (FILE *stream) /* We know at this point that _rl_caught_signal == 0 */ #if defined (__MINGW32__) - if (isatty (fd) + if (isatty (fd)) return (_getch ()); /* "There is no error return." */ #endif result = 0; diff --git a/readline/readline/rlprivate.h b/readline/readline/rlprivate.h index d87d07a72ee..cb9cf1791e2 100644 --- a/readline/readline/rlprivate.h +++ b/readline/readline/rlprivate.h @@ -303,7 +303,7 @@ extern int _rl_pushed_input_available (void); extern int _rl_timeout_init (void); extern int _rl_timeout_handle_sigalrm (void); -#if defined (_POSIXSELECT_H_) +#if defined (RL_TIMEOUT_USE_SELECT) /* use as a sentinel for fd_set, struct timeval, and sigset_t definitions */ extern int _rl_timeout_select (int, fd_set *, fd_set *, fd_set *, const struct timeval *, const sigset_t *); #endif