com php-src: Merge branch PHP-5.6 of php-src: phpdbg_cmd.c
| From: | Bob Weinand | Date: | Sun, 19 Jan 2014 11:26:14 +0000 |
| Subject: | com php-src: Merge branch PHP-5.6 of php-src: phpdbg_cmd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77092@lists.php.net to get a copy of this message | ||
Commit: 2e4aed3673607fda63edaac2b9b69669c5c1ceec
Author: Bob Weinand <bobwei9@hotmail.com> Sun, 19 Jan 2014 12:25:24 +0100
Parents: f27be2fded6b75cac1b13bd237c3ae0d8238a40d
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2e4aed3673607fda63edaac2b9b69669c5c1ceec
Log:
Merge branch PHP-5.6 of php-src
Changed paths:
M phpdbg_cmd.c
Diff:
diff --git a/phpdbg_cmd.c b/phpdbg_cmd.c
index dee3b6d..8429ce2 100644
--- a/phpdbg_cmd.c
+++ b/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;