Commit:    428dddd3e8dc8abaf99e22cf6ecf2cff00378fe5
Author:    Johannes Schlüter <johan...@php.net>         Thu, 31 May 2012 
01:15:22 +0200
Parents:   9b98cf78651af55b85b094f30037b7a55cb7735e
Branches:  PHP-5.4 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=428dddd3e8dc8abaf99e22cf6ecf2cff00378fe5

Log:
Fix bug #62186 readline fails to compile

Bugs:
https://bugs.php.net/62186

Changed paths:
  M  NEWS
  M  ext/readline/readline.c


Diff:
diff --git a/NEWS b/NEWS
index 898325a..d738ebe 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 1054b0e..92236a5 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);
 }
 
 /* }}} */


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to