fix warnings/50700 stuff

diff --git a/phpdbg.c b/phpdbg.c
index c6d44ba3aed55aab752b96fd22244449379f306d..ba40b15d71d6810cb6d9dbed145fd15358828673 100644 (file)
--- 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 bf160835a8179acf12f8d102bb3842adda744e61..15fb33ffd35011ef97618809eeca9a33673713d8 100644 (file)
--- 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 f1a09b888d02574c53603798bbfd7d8023cbe3ba..025d57a08dc49dc62ea5ca7053bd43dcbad107ad 100644 (file)
--- 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: