summaryrefslogtreecommitdiff
path: root/phpdbg_cmd.c
diff options
context:
space:
mode:
authorBob Weinand <bobwei9@hotmail.com>2014-06-29 11:26:03 +0200
committerBob Weinand <bobwei9@hotmail.com>2014-06-29 11:26:03 +0200
commit219beac36b9e421fd9a4920f214e9c63747eaafb (patch)
tree00419a74724c1b96fa98dea5caa5bf7c577271ea /phpdbg_cmd.c
parent858b45d4ad86a9d1ec857e20cf8c8e33c15500c0 (diff)
downloadphp-git-219beac36b9e421fd9a4920f214e9c63747eaafb.tar.gz
Fix readline/libedit (Thanks to @remicollet)
Diffstat (limited to 'phpdbg_cmd.c')
-rw-r--r--phpdbg_cmd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/phpdbg_cmd.c b/phpdbg_cmd.c
index d4ce8ebc55..a45513bee6 100644
--- a/phpdbg_cmd.c
+++ b/phpdbg_cmd.c
@@ -792,7 +792,7 @@ PHPDBG_API int phpdbg_stack_execute(phpdbg_param_t *stack, char **why TSRMLS_DC)
PHPDBG_API char* phpdbg_read_input(char *buffered TSRMLS_DC) /* {{{ */
{
char *cmd = NULL;
-#ifndef HAVE_LIBREADLINE
+#if !defined(HAVE_LIBREADLINE) && !defined(HAVE_LIBEDIT)
char buf[PHPDBG_MAX_CMD];
#endif
char *buffer = NULL;
@@ -811,7 +811,7 @@ disconnect:
return NULL;
}
-#ifndef HAVE_LIBREADLINE
+#if !defined(HAVE_LIBREADLINE) && !defined(HAVE_LIBEDIT)
if (!(PHPDBG_G(flags) & PHPDBG_IS_REMOTE)) {
if (!phpdbg_write("%s", phpdbg_get_prompt(TSRMLS_C))) {
goto disconnect;
@@ -850,7 +850,7 @@ readline:
buffer = estrdup(cmd);
-#ifdef HAVE_LIBREADLINE
+#if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDIT)
if (!buffered && cmd &&
!(PHPDBG_G(flags) & PHPDBG_IS_REMOTE)) {
free(cmd);