view src/readline-3-fd_set.patch @ 6516:5ef7d51c2195

readline: Update to version 8.2-001. * src/readline.mk: Update version and checksum. * src/readline-0-001-upstream.patch: Upstream patch re-formatted to apply in MXE Octave. See: https://ftp.gnu.org/pub/gnu/readline/readline-8.2-patches/readline82-001 * src/readline-0-002-upstream.patch: Remove upstream patch for previous version. * src/readline-1-input.patch, src/readline-1-sigwinch.patch: Update patches. * src/readline-3-fd_set.patch: Add patch to guard functions that use types that aren't available on Windows. * src/gdb-1-readline-8.2.patch: Cherry-pick upstream patch. * dist-files.mk: Update files in list.
author Markus Mützel <markus.muetzel@gmx.de>
date Sat, 12 Nov 2022 17:00:41 +0100
parents
children 5f2c92da4d9c
line wrap: on
line source

Guard functions that use types that aren't available on all platforms with
pre-processor conditions.

diff -urN readline-8.2/input.c.orig readline-8.2/input.c
--- readline-8.2/input.c.orig	2022-11-12 17:54:14.800371248 +0100
+++ readline-8.2/input.c	2022-11-12 17:58:13.327167979 +0100
@@ -151,7 +151,9 @@
 
 int _rl_timeout_init (void);
 int _rl_timeout_sigalrm_handler (void);
+#if defined (HAVE_PSELECT) || defined (HAVE_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)

diff -urN readline-8.2/rlprivate.h.orig readline-8.2/rlprivate.h
--- readline-8.2/rlprivate.h.orig	2022-08-12 00:35:16.000000000 +0200
+++ readline-8.2/rlprivate.h	2022-11-12 17:43:54.266291863 +0100
@@ -303,7 +303,7 @@
 
 extern int _rl_timeout_init (void);
 extern int _rl_timeout_handle_sigalrm (void);
-#if defined (_POSIXSELECT_H_)
+#if defined (HAVE_PSELECT) || defined (HAVE_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