summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2012-05-31 01:15:22 +0200
committerJohannes Schlüter <johannes@php.net>2012-05-31 01:15:22 +0200
commit428dddd3e8dc8abaf99e22cf6ecf2cff00378fe5 (patch)
tree0e1bd604aa112817646905232474d950040ac496
parent9b98cf78651af55b85b094f30037b7a55cb7735e (diff)
downloadphp-git-428dddd3e8dc8abaf99e22cf6ecf2cff00378fe5.tar.gz
Fix bug #62186 readline fails to compile
-rw-r--r--NEWS6
-rw-r--r--ext/readline/readline.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 898325afd1..d738ebe8de 100644
--- a/NEWS
+++ b/NEWS
@@ -82,7 +82,11 @@ PHP NEWS
- Libxml:
. Fixed bug #61617 (Libxml tests failed(ht is already destroyed)).
(Laruence)
-
+
+- Readline:
+ . Fixed bug #62186 (readline fails to compile - void function should not
+ return a value). (Johannes)
+
- Sockets:
. Fixed bug #62025 (__ss_family was changed on AIX 5.3). (Felipe)
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index 1054b0ea3b..92236a54f7 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -198,7 +198,7 @@ PHP_RSHUTDOWN_FUNCTION(readline)
PHP_MINFO_FUNCTION(readline)
{
- return PHP_MINFO(cli_readline)(ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU);
+ PHP_MINFO(cli_readline)(ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU);
}
/* }}} */