Mercurial > mxe-octave

annotate src/readline-0-004-fix-compilation-on-systems-that.patch @ 7251:e3bf1ceb1511 default tip @

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mesa 3D: Fix building for Linux without libdrm. * src/mesa-1-libdrm.patch: Add new patch. * dist-files.mk: Add new file to list.
author Markus Mützel <markus.muetzel@gmx.de>
date Wed, 12 Jun 2024 20:54:42 +0200
parents 142471155843
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6989
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
1 From c59116b15d95a94a9a2dd8ce5fe08850e004411a Mon Sep 17 00:00:00 2001
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
2 From: Chet Ramey <chet.ramey@case.edu>
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
3 Date: Fri, 17 Nov 2023 16:02:46 -0500
7042
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents: 6989
diff changeset
4 Subject: [PATCH 04/10] Readline-8.2 patch 4: fix compilation on systems that
6989
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
5 provide select or pselect but not both
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
6
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
7 ---
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
8 input.c | 6 ++++--
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
9 patchlevel | 2 +-
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
10 2 files changed, 5 insertions(+), 3 deletions(-)
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
11
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
12 diff --git a/input.c b/input.c
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
13 index 6f038d4..68d418c 100644
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
14 --- a/input.c
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
15 +++ b/input.c
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
16 @@ -151,7 +151,9 @@ int rl_timeout_remaining (unsigned int *, unsigned int *);
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
17
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
18 int _rl_timeout_init (void);
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
19 int _rl_timeout_sigalrm_handler (void);
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
20 +#if defined (RL_TIMEOUT_USE_SELECT)
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
21 int _rl_timeout_select (int, fd_set *, fd_set *, fd_set *, const struct timeval *, const sigset_t *);
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
22 +#endif
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
23
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
24 static void _rl_timeout_handle (void);
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
25 #if defined (RL_TIMEOUT_USE_SIGALRM)
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
26 @@ -248,7 +250,7 @@ rl_gather_tyi (void)
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
27 register int tem, result;
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
28 int chars_avail, k;
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
29 char input;
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
30 -#if defined(HAVE_SELECT)
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
31 +#if defined (HAVE_PSELECT) || defined (HAVE_SELECT)
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
32 fd_set readfds, exceptfds;
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
33 struct timeval timeout;
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
34 #endif
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
35 @@ -805,7 +807,7 @@ rl_getc (FILE *stream)
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
36 int result;
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
37 unsigned char c;
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
38 int fd;
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
39 -#if defined (HAVE_PSELECT)
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
40 +#if defined (HAVE_PSELECT) || defined (HAVE_SELECT)
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
41 sigset_t empty_set;
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
42 fd_set readfds;
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
43 #endif
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
44 diff --git a/patchlevel b/patchlevel
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
45 index ce3e355..626a945 100644
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
46 --- a/patchlevel
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
47 +++ b/patchlevel
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
48 @@ -1,3 +1,3 @@
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
49 # Do not edit -- exists only for use by patch
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
50
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
51 -3
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
52 +4
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
53 --
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
54 2.38.0.windows.1
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
55