com php-src: fix windows build: phpdbg_info.c phpdbg_op code.c phpdbg_prompt.c
| From: | Bob Weinand | Date: | Fri, 22 Nov 2013 20:42:57 +0000 |
| Subject: | com php-src: fix windows build: phpdbg_info.c phpdbg_op code.c phpdbg_prompt.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74709@lists.php.net to get a copy of this message | ||
Commit: 94ecb5a75f9bb0d2cedded28e0bb8a4b92916e86
Author: krakjoe <joe.watkins@live.co.uk> Fri, 22 Nov 2013 20:42:57 +0000
Parents: 6bf06ac0ba943952daddb2daeb934bdf60002fa2
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=94ecb5a75f9bb0d2cedded28e0bb8a4b92916e86
Log:
fix windows build
Changed paths:
M phpdbg_info.c
M phpdbg_opcode.c
M phpdbg_prompt.c
Diff:
diff --git a/phpdbg_info.c b/phpdbg_info.c
index 4b98267..ed63cad 100644
--- a/phpdbg_info.c
+++ b/phpdbg_info.c
@@ -151,7 +151,7 @@ PHPDBG_INFO(literal) /* {{{ */
{
if ((EG(in_execution) && EG(active_op_array)) || PHPDBG_G(ops)) {
zend_op_array *ops = EG(active_op_array) ? EG(active_op_array) : PHPDBG_G(ops);
- zend_uint literal =0, count = ops->last_literal-1;
+ int literal =0, count = ops->last_literal-1;
if (ops->function_name) {
if (ops->scope) {
diff --git a/phpdbg_opcode.c b/phpdbg_opcode.c
index 74b0c7e..d01f08c 100644
--- a/phpdbg_opcode.c
+++ b/phpdbg_opcode.c
@@ -27,7 +27,7 @@ ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
static inline zend_uint phpdbg_decode_literal(zend_op_array *ops, zend_literal *literal TSRMLS_DC)
/* {{{ */
{
- zend_uint iter = 0;
+ int iter = 0;
while (iter < ops->last_literal) {
if (literal == &ops->literals[iter]) {
diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index 98c79cf..53c6bb2 100644
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -1094,10 +1094,11 @@ static inline int phpdbg_call_register(phpdbg_input_t *input TSRMLS_DC) /*
{{{ *
int phpdbg_interactive(TSRMLS_D) /* {{{ */
{
int ret = SUCCESS;
-
+ phpdbg_input_t *input;
+
PHPDBG_G(flags) |= PHPDBG_IS_INTERACTIVE;
- phpdbg_input_t *input = phpdbg_read_input(NULL TSRMLS_CC);
+ input = phpdbg_read_input(NULL TSRMLS_CC);
if (input && input->length > 0L) {
do {