diff options
author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-02-23 23:53:32 +0100 |
---|---|---|
committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-02-23 23:53:32 +0100 |
commit | 94d0c24dcafd2171a1660ca96f7bcc9a1507145b (patch) | |
tree | a479f1b9e2c217b1836f1415542f43d68d5e7e18 /ext | |
parent | 701d1ab0cc0c42035160a53dc97b513167a3e5cc (diff) | |
parent | 32df2b6617dd6506fe3d51433bd6238022801953 (diff) | |
download | php-git-94d0c24dcafd2171a1660ca96f7bcc9a1507145b.tar.gz |
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix #75873: pcntl_wexitstatus returns incorrect on Big_Endian platform (s390x)
Diffstat (limited to 'ext')
-rw-r--r-- | ext/pcntl/pcntl.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c index 0aaddae064..75f2ab19e9 100644 --- a/ext/pcntl/pcntl.c +++ b/ext/pcntl/pcntl.c @@ -775,9 +775,10 @@ PHP_FUNCTION(pcntl_wifexited) return; } - if (WIFEXITED(status_word)) + if (WIFEXITED((int)status_word)) RETURN_TRUE; #endif + RETURN_FALSE; } /* }}} */ @@ -793,7 +794,7 @@ PHP_FUNCTION(pcntl_wifstopped) return; } - if (WIFSTOPPED(status_word)) + if (WIFSTOPPED((int)status_word)) RETURN_TRUE; #endif RETURN_FALSE; @@ -811,7 +812,7 @@ PHP_FUNCTION(pcntl_wifsignaled) return; } - if (WIFSIGNALED(status_word)) + if (WIFSIGNALED((int)status_word)) RETURN_TRUE; #endif RETURN_FALSE; @@ -828,7 +829,7 @@ PHP_FUNCTION(pcntl_wifcontinued) return; } - if (WIFCONTINUED(status_word)) + if (WIFCONTINUED((int)status_word)) RETURN_TRUE; #endif RETURN_FALSE; @@ -847,7 +848,7 @@ PHP_FUNCTION(pcntl_wexitstatus) return; } - RETURN_LONG(WEXITSTATUS(status_word)); + RETURN_LONG(WEXITSTATUS((int)status_word)); #else RETURN_FALSE; #endif @@ -865,7 +866,7 @@ PHP_FUNCTION(pcntl_wtermsig) return; } - RETURN_LONG(WTERMSIG(status_word)); + RETURN_LONG(WTERMSIG((int)status_word)); #else RETURN_FALSE; #endif @@ -883,7 +884,7 @@ PHP_FUNCTION(pcntl_wstopsig) return; } - RETURN_LONG(WSTOPSIG(status_word)); + RETURN_LONG(WSTOPSIG((int)status_word)); #else RETURN_FALSE; #endif |