diff options
| author | Anatol Belski <ab@php.net> | 2014-01-19 02:05:38 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-01-19 02:05:38 +0100 |
| commit | d788a85736abd4701004f3dcb3881ec7a7f9a4df (patch) | |
| tree | a3032908a263e0d80ec3cf550977eb313d34d6c3 | |
| parent | 9eb4bc2f84161f8169ab1da13f2b6491d3a4d3d0 (diff) | |
| parent | 12c1cfbf8f487c975dd3838a066a6f36d551122c (diff) | |
| download | php-git-d788a85736abd4701004f3dcb3881ec7a7f9a4df.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fix C89 compat
| -rw-r--r-- | sapi/phpdbg/phpdbg_cmd.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sapi/phpdbg/phpdbg_cmd.c b/sapi/phpdbg/phpdbg_cmd.c index 29424d00fe..c700851243 100644 --- a/sapi/phpdbg/phpdbg_cmd.c +++ b/sapi/phpdbg/phpdbg_cmd.c @@ -459,6 +459,9 @@ PHPDBG_API phpdbg_input_t *phpdbg_read_input(char *buffered TSRMLS_DC) /* {{{ */ { phpdbg_input_t *buffer = NULL; char *cmd = NULL; +#ifndef HAVE_LIBREADLINE + char buf[PHPDBG_MAX_CMD]; +#endif if (!(PHPDBG_G(flags) & PHPDBG_IS_QUITTING)) { if ((PHPDBG_G(flags) & PHPDBG_IS_REMOTE) && @@ -475,7 +478,6 @@ disconnect: } #ifndef HAVE_LIBREADLINE - char buf[PHPDBG_MAX_CMD]; if (!(PHPDBG_G(flags) & PHPDBG_IS_REMOTE)) { if (!phpdbg_write(phpdbg_get_prompt(TSRMLS_C))) { goto disconnect; |