|
 |
0c27299 |
diff -up php-5.3.0/ext/readline/config.m4.BAD php-5.3.0/ext/readline/config.m4
|
|
|
0c27299 |
--- php-5.3.0/ext/readline/config.m4.BAD 2009-11-17 16:14:45.289616920 -0500
|
|
|
0c27299 |
+++ php-5.3.0/ext/readline/config.m4 2009-11-17 16:14:59.588616924 -0500
|
|
|
0c27299 |
@@ -55,7 +55,7 @@ if test "$PHP_READLINE" && test "$PHP_RE
|
|
|
0c27299 |
elif test "$PHP_LIBEDIT" != "no"; then
|
|
|
0c27299 |
|
|
|
0c27299 |
for i in $PHP_LIBEDIT /usr/local /usr; do
|
|
|
0c27299 |
- test -f $i/include/readline/readline.h && LIBEDIT_DIR=$i && break
|
|
|
0c27299 |
+ test -f $i/include/editline/readline.h && LIBEDIT_DIR=$i && break
|
|
|
0c27299 |
done
|
|
|
0c27299 |
|
|
|
0c27299 |
if test -z "$LIBEDIT_DIR"; then
|
|
|
0c27299 |
diff -up php-5.3.0/ext/readline/readline.c.BAD php-5.3.0/ext/readline/readline.c
|
|
|
0c27299 |
--- php-5.3.0/ext/readline/readline.c.BAD 2009-11-17 16:15:30.151716204 -0500
|
|
|
0c27299 |
+++ php-5.3.0/ext/readline/readline.c 2009-11-17 16:16:27.902715621 -0500
|
|
|
0c27299 |
@@ -33,8 +33,10 @@
|
|
|
0c27299 |
#define rl_completion_matches completion_matches
|
|
|
0c27299 |
#endif
|
|
|
0c27299 |
|
|
|
0c27299 |
+#ifdef HAVE_LIBEDIT
|
|
|
0c27299 |
+#include <editline/readline.h>
|
|
|
0c27299 |
+#else
|
|
|
0c27299 |
#include <readline/readline.h>
|
|
|
0c27299 |
-#ifndef HAVE_LIBEDIT
|
|
|
0c27299 |
#include <readline/history.h>
|
|
|
0c27299 |
#endif
|
|
|
0c27299 |
|
|
|
0c27299 |
diff -up php-5.3.0/sapi/cli/php_cli.c.BAD php-5.3.0/sapi/cli/php_cli.c
|
|
|
0c27299 |
--- php-5.3.0/sapi/cli/php_cli.c.BAD 2009-11-17 16:16:51.421617342 -0500
|
|
|
0c27299 |
+++ php-5.3.0/sapi/cli/php_cli.c 2009-11-17 16:17:35.026715984 -0500
|
|
|
0c27299 |
@@ -76,8 +76,11 @@
|
|
|
0c27299 |
#endif
|
|
|
0c27299 |
|
|
|
0c27299 |
#if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE)
|
|
|
0c27299 |
+
|
|
|
0c27299 |
+#if HAVE_LIBEDIT
|
|
|
0c27299 |
+#include <editline/readline.h>
|
|
|
0c27299 |
+#else
|
|
|
0c27299 |
#include <readline/readline.h>
|
|
|
0c27299 |
-#if !HAVE_LIBEDIT
|
|
|
0c27299 |
#include <readline/history.h>
|
|
|
0c27299 |
#endif
|
|
|
0c27299 |
#include "php_cli_readline.h"
|
|
|
0c27299 |
diff -up php-5.3.0/sapi/cli/php_cli_readline.c.BAD php-5.3.0/sapi/cli/php_cli_readline.c
|
|
|
0c27299 |
--- php-5.3.0/sapi/cli/php_cli_readline.c.BAD 2009-11-17 16:17:51.398715697 -0500
|
|
|
0c27299 |
+++ php-5.3.0/sapi/cli/php_cli_readline.c 2009-11-17 16:18:19.241715654 -0500
|
|
|
0c27299 |
@@ -49,8 +49,10 @@
|
|
|
0c27299 |
#include <unixlib/local.h>
|
|
|
0c27299 |
#endif
|
|
|
0c27299 |
|
|
|
0c27299 |
+#if HAVE_LIBEDIT
|
|
|
0c27299 |
+#include <editline/readline.h>
|
|
|
0c27299 |
+#else
|
|
|
0c27299 |
#include <readline/readline.h>
|
|
|
0c27299 |
-#if !HAVE_LIBEDIT
|
|
|
0c27299 |
#include <readline/history.h>
|
|
|
0c27299 |
#endif
|
|
|
0c27299 |
|