Fixed compile warnings

diff --git a/sapi/phpdbg/phpdbg_cmd.c b/sapi/phpdbg/phpdbg_cmd.c
index 3e3f932f976896e54a0809b9a762db1e0ab20f8d..6e5b2ecaf79a13fe52d122aa402586b466cce070 100644 (file)
--- a/sapi/phpdbg/phpdbg_cmd.c
+++ b/sapi/phpdbg/phpdbg_cmd.c
@@ -99,7 +99,7 @@ PHPDBG_API char* phpdbg_param_tostring(const phpdbg_param_t *param, char **point
                break;
 
                case ADDR_PARAM:
-                       asprintf(pointer, "%#llx", param->addr);
+                       asprintf(pointer, ZEND_ULONG_FMT, param->addr);
                break;
 
                case NUMERIC_PARAM:
@@ -329,7 +329,7 @@ PHPDBG_API void phpdbg_param_debug(const phpdbg_param_t *param, const char *msg)
                        break;
 
                        case ADDR_PARAM:
-                               fprintf(stderr, "%s ADDR_PARAM(%llu)\n", msg, param->addr);
+                               fprintf(stderr, "%s ADDR_PARAM(" ZEND_ULONG_FMT ")\n", msg, param->addr);
                        break;
 
                        case NUMERIC_FILE_PARAM:

diff --git a/sapi/phpdbg/phpdbg_opcode.c b/sapi/phpdbg/phpdbg_opcode.c
index a0b20bb9c714da59ec0d57d4e22e80bca5fadff3..3cfc8e5cb5ce272d63112bd5caa0e9ecb4658504 100644 (file)
--- a/sapi/phpdbg/phpdbg_opcode.c
+++ b/sapi/phpdbg/phpdbg_opcode.c
@@ -60,7 +60,7 @@ static inline char *phpdbg_decode_op(zend_op_array *ops, znode_op *op, uint32_t
                                        zend_hash_index_update_mem(vars, (zend_ulong) ops->vars - op->var, &id, sizeof(zend_ulong));
                                }
                        }
-                       asprintf(&decode, "@%llu", id);
+                       asprintf(&decode, "@" ZEND_ULONG_FMT, id);
                } break;
 
                case IS_CONST:
@@ -91,7 +91,7 @@ char *phpdbg_decode_opline(zend_op_array *ops, zend_op *op, HashTable *vars) /*{
 
        case ZEND_JMPZNZ:
                        decode[1] = phpdbg_decode_op(ops, &op->op1, op->op1_type, vars);
-                       asprintf(&decode[2], "J%u or J%llu", op->op2.opline_num, op->extended_value);
+                       asprintf(&decode[2], "J%u or J%" PRIu32, op->op2.opline_num, op->extended_value);
                goto result;
 
        case ZEND_JMPZ:

diff --git a/sapi/phpdbg/phpdbg_watch.c b/sapi/phpdbg/phpdbg_watch.c
index c1d0762af602ddf07cac6bd1fe26790270e3ea29..f63b52294e933b9778c5c32d63e266fa7721c14b 100644 (file)
--- a/sapi/phpdbg/phpdbg_watch.c
+++ b/sapi/phpdbg/phpdbg_watch.c
@@ -332,7 +332,7 @@ static void phpdbg_delete_ht_watchpoints_recursive(phpdbg_watchpoint_t *watch) {
                if (strkey) {
                        str_len = asprintf(&str, "%.*s%s%s%s", (int) watch->str_len, watch->str, (watch->flags & PHPDBG_WATCH_ARRAY) ? "[" : "->", phpdbg_get_property_key(strkey->val), (watch->flags & PHPDBG_WATCH_ARRAY) ? "]" : "");
                } else {
-                       str_len = asprintf(&str, "%.*s%s%lli%s", (int) watch->str_len, watch->str, (watch->flags & PHPDBG_WATCH_ARRAY) ? "[" : "->", numkey, (watch->flags & PHPDBG_WATCH_ARRAY) ? "]" : "");
+                       str_len = asprintf(&str, "%.*s%s" ZEND_LONG_FMT "%s", (int) watch->str_len, watch->str, (watch->flags & PHPDBG_WATCH_ARRAY) ? "[" : "->", numkey, (watch->flags & PHPDBG_WATCH_ARRAY) ? "]" : "");
                }
 
                if ((watchpoint = zend_hash_str_find_ptr(&PHPDBG_G(watchpoints), str, str_len))) {