sniper Mon Nov 28 11:51:16 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/ext/readline config.m4 readline.c
/php-src/sapi/cli php_cli_readline.c
Log:
MFH: - Fixed bug #35409 (undefined reference to 'rl_completion_matches').
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.240&r2=1.2027.2.241&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.240 php-src/NEWS:1.2027.2.241
--- php-src/NEWS:1.2027.2.240 Mon Nov 28 09:32:29 2005
+++ php-src/NEWS Mon Nov 28 11:51:14 2005
@@ -3,6 +3,7 @@
?? ??? 200?, PHP 5.1.2
- Fixed bug #35431 (PDO crashes when using LAZY fetch with fetchAll). (Wez)
- Fixed bug #35430 (PDO crashes on incorrect FETCH_FUNC use). (Tony)
+- Fixed bug #35409 (undefined reference to 'rl_completion_matches'). (Jani)
- Fixed bug #35399 (Since fix of bug #35273 SOAP decoding of
soapenc:base64binary fails). (Dmitry)
- Fixed bug #35393 (changing static protected members from outside the class,
http://cvs.php.net/diff.php/php-src/ext/readline/config.m4?r1=1.25.2.1&r2=1.25.2.2&ty=u
Index: php-src/ext/readline/config.m4
diff -u php-src/ext/readline/config.m4:1.25.2.1
php-src/ext/readline/config.m4:1.25.2.2
--- php-src/ext/readline/config.m4:1.25.2.1 Fri Nov 18 10:07:39 2005
+++ php-src/ext/readline/config.m4 Mon Nov 28 11:51:16 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.25.2.1 2005/11/18 15:07:39 sniper Exp $
+dnl $Id: config.m4,v 1.25.2.2 2005/11/28 16:51:16 sniper Exp $
dnl
PHP_ARG_WITH(libedit,for libedit readline replacement,
@@ -59,8 +59,6 @@
-L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
])
- PHP_NEW_EXTENSION(readline, readline.c, $ext_shared, cli)
- PHP_SUBST(READLINE_SHARED_LIBADD)
AC_DEFINE(HAVE_LIBREADLINE, 1, [ ])
elif test "$PHP_LIBEDIT" != "no"; then
@@ -94,7 +92,11 @@
-L$READLINE_DIR/$PHP_LIBDIR
])
+ AC_DEFINE(HAVE_LIBEDIT, 1, [ ])
+fi
+
+if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then
+ AC_CHECK_FUNCS([rl_completion_matches])
PHP_NEW_EXTENSION(readline, readline.c, $ext_shared, cli)
PHP_SUBST(READLINE_SHARED_LIBADD)
- AC_DEFINE(HAVE_LIBEDIT, 1, [ ])
fi
http://cvs.php.net/diff.php/php-src/ext/readline/readline.c?r1=1.42&r2=1.42.2.1&ty=u
Index: php-src/ext/readline/readline.c
diff -u php-src/ext/readline/readline.c:1.42
php-src/ext/readline/readline.c:1.42.2.1
--- php-src/ext/readline/readline.c:1.42 Wed Aug 3 10:07:42 2005
+++ php-src/ext/readline/readline.c Mon Nov 28 11:51:16 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: readline.c,v 1.42 2005/08/03 14:07:42 sniper Exp $ */
+/* $Id: readline.c,v 1.42.2.1 2005/11/28 16:51:16 sniper Exp $ */
/* {{{ includes & prototypes */
@@ -29,6 +29,10 @@
#if HAVE_LIBREADLINE || HAVE_LIBEDIT
+#ifndef HAVE_RL_COMPLETION_MATCHES
+#define rl_completion_matches completion_matches
+#endif
+
#include <readline/readline.h>
#ifndef HAVE_LIBEDIT
#include <readline/history.h>
@@ -421,7 +425,7 @@
if (call_user_function(CG(function_table), NULL, _readline_completion,
&_readline_array, 3, params TSRMLS_CC) == SUCCESS) {
if (Z_TYPE(_readline_array) == IS_ARRAY) {
if (zend_hash_num_elements(Z_ARRVAL(_readline_array))) {
- matches =
completion_matches(text,_readline_command_generator);
+ matches =
rl_completion_matches(text,_readline_command_generator);
} else {
matches = malloc(sizeof(char *) * 2);
matches[0] = strdup("");
http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli_readline.c?r1=1.3.2.3&r2=1.3.2.4&ty=u
Index: php-src/sapi/cli/php_cli_readline.c
diff -u php-src/sapi/cli/php_cli_readline.c:1.3.2.3
php-src/sapi/cli/php_cli_readline.c:1.3.2.4
--- php-src/sapi/cli/php_cli_readline.c:1.3.2.3 Thu Nov 17 03:37:31 2005
+++ php-src/sapi/cli/php_cli_readline.c Mon Nov 28 11:51:16 2005
@@ -17,12 +17,16 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_cli_readline.c,v 1.3.2.3 2005/11/17 08:37:31 sniper Exp $ */
+/* $Id: php_cli_readline.c,v 1.3.2.4 2005/11/28 16:51:16 sniper Exp $ */
#include "php.h"
#if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE)
+#ifndef HAVE_RL_COMPLETION_MATCHES
+#define rl_completion_matches completion_matches
+#endif
+
#include "php_globals.h"
#include "php_variables.h"
#include "zend_hash.h"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
