diff options
| author | krakjoe <joe.watkins@live.co.uk> | 2013-12-18 10:31:14 +0000 |
|---|---|---|
| committer | krakjoe <joe.watkins@live.co.uk> | 2013-12-18 10:31:14 +0000 |
| commit | 7e0d1938f9e875a96284c217f28a2e7a1995539d (patch) | |
| tree | 21fe5dbe7f9376b8103968d51dcdb6e6573891b4 | |
| parent | 5cc9a35f1b96499c00a1336275e4ffe120bb69db (diff) | |
| download | php-git-7e0d1938f9e875a96284c217f28a2e7a1995539d.tar.gz | |
fix warnings/50700 stuff
| -rw-r--r-- | phpdbg.c | 5 | ||||
| -rw-r--r-- | phpdbg_cmd.c | 2 | ||||
| -rw-r--r-- | phpdbg_opcode.c | 4 |
3 files changed, 8 insertions, 3 deletions
@@ -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 bf160835a8..15fb33ffd3 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 f1a09b888d..025d57a08d 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: |