summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
authorFelipe Pena <felipe@php.net>2009-12-13 17:06:47 (GMT)
committerFelipe Pena <felipe@php.net>2009-12-13 17:06:47 (GMT)
commit4411621217dfc40dcb544684b33d5cf863d63e01 (patch)
tree1fab22470c891dbea62cf364a9541d513675dbf9 /sapi
parenteb3eea266954a1ce26ebd7c3cad546d2eab7fb41 (diff)
downloadphp-4411621217dfc40dcb544684b33d5cf863d63e01.tar.gz
- Fixed bug #50209 (Compiling with libedit cannot find readline.h)
(patch by tcallawa at redhat dot com)
Diffstat (limited to 'sapi')
-rw-r--r--sapi/cli/php_cli.c4
-rw-r--r--sapi/cli/php_cli_readline.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index c4474d4..d5878a5 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -76,8 +76,10 @@
#endif
#if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE)
+#if HAVE_LIBEDIT
+#include <editline/readline.h>
+#else
#include <readline/readline.h>
-#if !HAVE_LIBEDIT
#include <readline/history.h>
#endif
#include "php_cli_readline.h"
diff --git a/sapi/cli/php_cli_readline.c b/sapi/cli/php_cli_readline.c
index 22327a2..c26e8cf 100644
--- a/sapi/cli/php_cli_readline.c
+++ b/sapi/cli/php_cli_readline.c
@@ -49,8 +49,10 @@
#include <unixlib/local.h>
#endif
+#if HAVE_LIBEDIT
+#include <editline/readline.h>
+#else
#include <readline/readline.h>
-#if !HAVE_LIBEDIT
#include <readline/history.h>
#endif