diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-09-19 16:08:04 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-09-19 16:08:04 +0100 |
| commit | c9e4a6f1910dea250af69a3774bcf1fee7e7b8f5 (patch) | |
| tree | 42cdd46d684341357d892515750254d8ca13dd8c | |
| parent | 65449bd1ee5cebde288a8f0150fe7d54c6c6ef31 (diff) | |
| download | vim-git-c9e4a6f1910dea250af69a3774bcf1fee7e7b8f5.tar.gz | |
patch 9.0.0504: still a build failurev9.0.0504
Problem: still a Build failure.
Solution: Add another missing changes. Avoid compiler warning.
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9execute.c | 6 | ||||
| -rw-r--r-- | src/vim9expr.c | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/version.c b/src/version.c index 6bd68dc36..a8e0151a8 100644 --- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 504, +/**/ 503, /**/ 502, diff --git a/src/vim9execute.c b/src/vim9execute.c index c1c2e124a..51c5420bc 100644 --- a/src/vim9execute.c +++ b/src/vim9execute.c @@ -5955,13 +5955,13 @@ printable_loopvarinfo(loopvarinfo_T *lvi) if (ga_grow(&ga, 50) == FAIL) break; if (lvi->lvi_loop[depth].var_idx == 0) - STRCPY(ga.ga_data + ga.ga_len, " -"); + STRCPY((char *)ga.ga_data + ga.ga_len, " -"); else - vim_snprintf(ga.ga_data + ga.ga_len, 50, " $%d-$%d", + vim_snprintf((char *)ga.ga_data + ga.ga_len, 50, " $%d-$%d", lvi->lvi_loop[depth].var_idx, lvi->lvi_loop[depth].var_idx + lvi->lvi_loop[depth].var_count - 1); - ga.ga_len = STRLEN(ga.ga_data); + ga.ga_len = (int)STRLEN(ga.ga_data); } return ga.ga_data; } diff --git a/src/vim9expr.c b/src/vim9expr.c index 5f1e07d82..0e44b7652 100644 --- a/src/vim9expr.c +++ b/src/vim9expr.c @@ -496,6 +496,7 @@ compile_load( int idx; int gen_load = FALSE; int gen_load_outer = 0; + int outer_loop_depth = -1; int outer_loop_idx = -1; name = vim_strnsave(*arg, end - *arg); @@ -521,6 +522,7 @@ compile_load( { type = lvar.lv_type; idx = lvar.lv_idx; + outer_loop_depth = lvar.lv_loop_depth; outer_loop_idx = lvar.lv_loop_idx; if (lvar.lv_from_outer != 0) gen_load_outer = lvar.lv_from_outer; @@ -546,8 +548,8 @@ compile_load( res = generate_LOAD(cctx, ISN_LOAD, idx, NULL, type); if (gen_load_outer > 0) { - res = generate_LOADOUTER(cctx, idx, - gen_load_outer, outer_loop_idx, type); + res = generate_LOADOUTER(cctx, idx, gen_load_outer, + outer_loop_depth, outer_loop_idx, type); cctx->ctx_outer_used = TRUE; } } |