diff --git a/src/os_unix.c b/src/os_unix.c index d36eb46a2c..58f8276fb5 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -887,8 +887,10 @@ sig_tstp SIGDEFARG(sigarg) else got_tstp = TRUE; - // this is not required on all systems, but it doesn't hurt anybody +#ifndef __ANDROID__ + // this is not required on all systems signal(SIGTSTP, (RETSIGTYPE (*)())sig_tstp); +#endif SIGRETURN; } #endif diff --git a/src/version.c b/src/version.c index a8c0bdc553..b9b6aac63b 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 4480, /**/ 4479, /**/