diff options
| author | Nikita Popov <nikic@php.net> | 2016-07-30 18:35:41 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-07-30 18:36:00 +0200 |
| commit | c4d35c321414c66027318de130290e1fa613eb6b (patch) | |
| tree | 3b57c8b1fa8d6f35bcecec68e95fbcb8a8f5296c | |
| parent | 9fe0398dad29c31d477e2225589eeec8977eb423 (diff) | |
| parent | c9d3ff0c6e86398b9471428ab49c6a6fa47ae977 (diff) | |
| download | php-git-c4d35c321414c66027318de130290e1fa613eb6b.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/posix/config.m4 | 2 |
2 files changed, 1 insertions, 5 deletions
@@ -87,10 +87,6 @@ PHP NEWS . Implemented FR #72633 (Postgres PDO lastInsertId() should work without specifying a sequence). (Pablo Santiago Sánchez) -- Posix: - . Fixed bug #71219 (php's configure script incorrectly checks for ttyname_r - availability). (Nikita) - - Reflection: . Fixed bug #72222 (ReflectionClass::export doesn't handle array constants). (Nikita Nefedov) diff --git a/ext/posix/config.m4 b/ext/posix/config.m4 index 0c4c30561e..9dfa70d1db 100644 --- a/ext/posix/config.m4 +++ b/ext/posix/config.m4 @@ -21,7 +21,7 @@ int main(int argc, char *argv[]) { char buf[64]; - return !ttyname_r(0, buf, 64); + return ttyname_r(0, buf, 64) ? 1 : 0; } ],[ AC_MSG_RESULT([yes]) |