From: Bob Weinand <bobwei9@hotmail.com>
Date: Sun, 19 Jan 2014 11:25:24 +0000 (+0100)
Subject: Merge branch PHP-5.6 of php-src
X-Git-Tag: php-5.6.0beta2~1^2~37^2~23^2~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2e4aed3673607fda63edaac2b9b69669c5c1ceec;p=php

Merge branch PHP-5.6 of php-src
---

diff --git a/phpdbg_cmd.c b/phpdbg_cmd.c
index dee3b6da19..8429ce280e 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;