diff options
| author | Ondřej Surý <ondrej@sury.org> | 2014-07-02 13:10:19 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2014-07-02 13:10:19 +0200 |
| commit | 09ed144817606a3a835391b12455e6d9cb3a0ae2 (patch) | |
| tree | 1284c43d38c82704eada3d721265b96ae8b4aee3 /sapi/phpdbg/phpdbg_cmd.c | |
| parent | 60d44b592c4c4fdcbbf92db2882a97a9cc54713c (diff) | |
| download | php-09ed144817606a3a835391b12455e6d9cb3a0ae2.tar.gz | |
New upstream version 5.6.0~rc2+dfsgupstream/5.6.0_rc2+dfsg
Diffstat (limited to 'sapi/phpdbg/phpdbg_cmd.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_cmd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sapi/phpdbg/phpdbg_cmd.c b/sapi/phpdbg/phpdbg_cmd.c index d4ce8ebc5..a45513bee 100644 --- a/sapi/phpdbg/phpdbg_cmd.c +++ b/sapi/phpdbg/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); |