summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/os_unix.c5
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/os_unix.c b/src/os_unix.c
index 58f8276fb..e617b128f 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -887,8 +887,9 @@ sig_tstp SIGDEFARG(sigarg)
else
got_tstp = TRUE;
-#ifndef __ANDROID__
- // this is not required on all systems
+#if !defined(__ANDROID__) && !defined(__OpenBSD__)
+ // This is not required on all systems. On some systems (at least Android
+ // and OpenBSD) this breaks suspending with CTRL-Z.
signal(SIGTSTP, (RETSIGTYPE (*)())sig_tstp);
#endif
SIGRETURN;
diff --git a/src/version.c b/src/version.c
index 9b25ef0de..9248ca403 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4532,
+/**/
4531,
/**/
4530,