sniper Mon Nov 28 11:49:35 2005 EDT
Modified files:
/php-src/sapi/cli php_cli_readline.c
/php-src/ext/readline config.m4 readline.c
Log:
- Fixed bug #35409 (undefined reference to 'rl_completion_matches')
http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli_readline.c?r1=1.6&r2=1.7&ty=u
Index: php-src/sapi/cli/php_cli_readline.c
diff -u php-src/sapi/cli/php_cli_readline.c:1.6
php-src/sapi/cli/php_cli_readline.c:1.7
--- php-src/sapi/cli/php_cli_readline.c:1.6 Thu Nov 17 03:36:12 2005
+++ php-src/sapi/cli/php_cli_readline.c Mon Nov 28 11:49:35 2005
@@ -17,12 +17,16 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_cli_readline.c,v 1.6 2005/11/17 08:36:12 sniper Exp $ */
+/* $Id: php_cli_readline.c,v 1.7 2005/11/28 16:49:35 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"
http://cvs.php.net/diff.php/php-src/ext/readline/config.m4?r1=1.26&r2=1.27&ty=u
Index: php-src/ext/readline/config.m4
diff -u php-src/ext/readline/config.m4:1.26 php-src/ext/readline/config.m4:1.27
--- php-src/ext/readline/config.m4:1.26 Fri Nov 18 10:11:14 2005
+++ php-src/ext/readline/config.m4 Mon Nov 28 11:49:35 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.26 2005/11/18 15:11:14 sniper Exp $
+dnl $Id: config.m4,v 1.27 2005/11/28 16:49:35 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.43&r2=1.44&ty=u
Index: php-src/ext/readline/readline.c
diff -u php-src/ext/readline/readline.c:1.43
php-src/ext/readline/readline.c:1.44
--- php-src/ext/readline/readline.c:1.43 Mon Aug 22 08:22:11 2005
+++ php-src/ext/readline/readline.c Mon Nov 28 11:49:35 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: readline.c,v 1.43 2005/08/22 12:22:11 dmitry Exp $ */
+/* $Id: readline.c,v 1.44 2005/11/28 16:49:35 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("");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
