com php-src: some more after merge fixes: sapi/phpdbg/phpdbg_ frame.c sapi/phpdbg/phpdbg_prompt.c

Commit: 047a39c94670517239e9153bfa4680b3aebacaf3 Author: Anatol Belski <ab@php.net> Sat, 26 Apr 2014 00:42:22 +0200 Parents: e88c8cbb7bd6006e88934eff39b6eddc36790594 Branches: str_size_and_int64_56_backport Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=047a39c94670517239e9153bfa4680b3aebacaf3 Log: some more after merge fixes Changed paths: M sapi/phpdbg/phpdbg_frame.c M sapi/phpdbg/phpdbg_prompt.c Diff: diff --git a/sapi/phpdbg/phpdbg_frame.c b/sapi/phpdbg/phpdbg_frame.c index 8537185..feab632 100644 --- a/sapi/phpdbg/phpdbg_frame.c +++ b/sapi/phpdbg/phpdbg_frame.c @@ -186,7 +186,7 @@ void phpdbg_dump_backtrace(size_t num TSRMLS_DC) /* {{{ */ if (zend_hash_get_current_data_ex(Z_ARRVAL(zbacktrace), (void**)&tmp, &position) == FAILURE) { - phpdbg_write("frame #%d: {main} at %s:%pd", i, Z_STRVAL_PP(file), Z_LVAL_PP(line)); + phpdbg_write("frame #%d: {main} at %s:%pd", i, Z_STRVAL_PP(file), Z_IVAL_PP(line)); break; } diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c index 8669f01..122e46b 100644 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@ -120,7 +120,7 @@ static inline int phpdbg_call_register(phpdbg_param_t *stack TSRMLS_DC) /* {{{ * break; case NUMERIC_PARAM: - add_next_index_long(&params, next->num); + add_next_index_int(&params, next->num); break; case METHOD_PARAM: