Commit: 7e0d1938f9e875a96284c217f28a2e7a1995539d Author: krakjoe <joe.watk...@live.co.uk> Wed, 18 Dec 2013 10:31:14 +0000 Parents: 5cc9a35f1b96499c00a1336275e4ffe120bb69db Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7e0d1938f9e875a96284c217f28a2e7a1995539d Log: fix warnings/50700 stuff Changed paths: M phpdbg.c M phpdbg_cmd.c M phpdbg_opcode.c Diff: diff --git a/phpdbg.c b/phpdbg.c index c6d44ba..ba40b15 100644 --- a/phpdbg.c +++ b/phpdbg.c @@ -499,9 +499,14 @@ static inline int php_sapi_phpdbg_ub_write(const char *message, unsigned int len return phpdbg_write("%s", message); } /* }}} */ +#if PHP_VERSION_ID >= 50700 +static inline void php_sapi_phpdbg_flush(void *context TSRMLS_DC) /* {{{ */ +{ +#else static inline void php_sapi_phpdbg_flush(void *context) /* {{{ */ { TSRMLS_FETCH(); +#endif fflush(PHPDBG_G(io)[PHPDBG_STDOUT]); } /* }}} */ diff --git a/phpdbg_cmd.c b/phpdbg_cmd.c index bf16083..15fb33f 100644 --- a/phpdbg_cmd.c +++ b/phpdbg_cmd.c @@ -436,7 +436,7 @@ PHPDBG_API phpdbg_input_t **phpdbg_read_argv(char *buffer, int *argc TSRMLS_DC) case IN_STRING: phpdbg_error( - "Malformed command line (unclosed quote) @ %d: %s!", + "Malformed command line (unclosed quote) @ %ld: %s!", (p - buffer)-1, &buffer[(p - buffer)-1]); break; diff --git a/phpdbg_opcode.c b/phpdbg_opcode.c index f1a09b8..025d57a 100644 --- a/phpdbg_opcode.c +++ b/phpdbg_opcode.c @@ -85,7 +85,7 @@ char *phpdbg_decode_opline(zend_op_array *ops, zend_op *op, HashTable *vars TSRM #ifdef ZEND_FAST_CALL case ZEND_FAST_CALL: #endif - asprintf(&decode[1], "J%d", op->op1.jmp_addr - ops->opcodes); + asprintf(&decode[1], "J%ld", op->op1.jmp_addr - ops->opcodes); goto format; case ZEND_JMPZNZ: @@ -107,7 +107,7 @@ char *phpdbg_decode_opline(zend_op_array *ops, zend_op *op, HashTable *vars TSRM #endif decode[1] = phpdbg_decode_op(ops, &op->op1, op->op1_type, vars TSRMLS_CC); asprintf( - &decode[2], "J%d", op->op2.jmp_addr - ops->opcodes); + &decode[2], "J%ld", op->op2.jmp_addr - ops->opcodes); goto result; case ZEND_RECV_INIT: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
