com php-src: after merge fix, some datatypes: sapi/phpdbg/phpdb g_list.c sapi/phpdbg/phpdbg_list.h sapi/phpdbg/phpd bg_prompt.c

Commit: 472579280f7ab1c462648f731d4274937b102b09 Author: Anatol Belski <ab@php.net> Sun, 2 Feb 2014 20:33:24 +0100 Parents: 7061c3572528b28839a59e784d667d45b9a17099 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=472579280f7ab1c462648f731d4274937b102b09 Log: after merge fix, some datatypes Changed paths: M sapi/phpdbg/phpdbg_list.c M sapi/phpdbg/phpdbg_list.h M sapi/phpdbg/phpdbg_prompt.c Diff: diff --git a/sapi/phpdbg/phpdbg_list.c b/sapi/phpdbg/phpdbg_list.c index 93e4c7b..12cdc91 100644 --- a/sapi/phpdbg/phpdbg_list.c +++ b/sapi/phpdbg/phpdbg_list.c @@ -130,7 +130,7 @@ PHPDBG_LIST(class) /* {{{ */ return SUCCESS; } /* }}} */ -void phpdbg_list_file(const char *filename, php_int_t count, php_int_t offset, int highlight TSRMLS_DC) /* {{{ */ +void phpdbg_list_file(const char *filename, php_int_t count, php_int_t offset, php_int_t highlight TSRMLS_DC) /* {{{ */ { unsigned char *mem, *pos, *last_pos, *end_pos; zend_stat_t st; diff --git a/sapi/phpdbg/phpdbg_list.h b/sapi/phpdbg/phpdbg_list.h index 8466869..1d35520 100644 --- a/sapi/phpdbg/phpdbg_list.h +++ b/sapi/phpdbg/phpdbg_list.h @@ -34,7 +34,7 @@ PHPDBG_LIST(func); void phpdbg_list_function_byname(const char *, size_t TSRMLS_DC); void phpdbg_list_function(const zend_function* TSRMLS_DC); -void phpdbg_list_file(const char*, php_int_t, php_int_t, int TSRMLS_DC); +void phpdbg_list_file(const char*, php_int_t, php_int_t, php_int_t TSRMLS_DC); static const phpdbg_command_t phpdbg_list_commands[] = { PHPDBG_COMMAND_D_EX(lines, "lists the specified lines", 'l', list_lines, NULL, 1), diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c index 678ff05..4e28b6b 100644 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@ -388,7 +388,7 @@ PHPDBG_COMMAND(until) /* {{{ */ PHPDBG_G(flags) |= PHPDBG_IN_UNTIL; { - zend_uint next = 0, + zend_uint_t next = 0, self = (EG(current_execute_data)->opline - EG(active_op_array)->opcodes); zend_op *opline = &EG(active_op_array)->opcodes[self]; @@ -416,7 +416,7 @@ PHPDBG_COMMAND(finish) /* {{{ */ PHPDBG_G(flags) |= PHPDBG_IN_FINISH; { - zend_uint next = 0, + php_uint_t next = 0, self = (EG(current_execute_data)->opline - EG(active_op_array)->opcodes); for (next = self; next < EG(active_op_array)->last; next++) { @@ -449,7 +449,7 @@ PHPDBG_COMMAND(leave) /* {{{ */ PHPDBG_G(flags) |= PHPDBG_IN_LEAVE; { - zend_uint next = 0, + php_uint_t next = 0, self = (EG(current_execute_data)->opline - EG(active_op_array)->opcodes); for (next = self; next < EG(active_op_array)->last; next++) { @@ -500,7 +500,7 @@ static inline void phpdbg_handle_exception(TSRMLS_D) /* }}} */ /* get filename and linenumber before unsetting exception */ const char *filename = zend_get_executed_filename(TSRMLS_C); - zend_uint lineno = zend_get_executed_lineno(TSRMLS_C); + php_uint_t lineno = zend_get_executed_lineno(TSRMLS_C); /* copy exception */ exception = *EG(exception);