patch 9.0.0504: still a build failure

Problem:    still a Build failure.
Solution:   Add another missing changes.  Avoid compiler warning.

diff --git a/src/version.c b/src/version.c
index 6bd68dc36aaf44d86a2a10c730c6803bd5324c81..a8e0151a87df10e51d87664a5b1d42b864eb7500 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -699,6 +699,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    504,
 /**/
     503,
 /**/

diff --git a/src/vim9execute.c b/src/vim9execute.c
index c1c2e124a88a285e6c89c82cc38409b37b381dc7..51c5420bcd3a4a15f4139597d19e9bf8c2233142 100644 (file)
--- 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 5f1e07d828a5196e2722b6e61c47ee76430edc05..0e44b7652f4ed2b5124461a18ae4acc7e46f3cea 100644 (file)
--- 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;
        }
     }