diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-09-19 14:31:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-19 14:31:10 -0400 |
| commit | 89db07556dbdce97c0c150ed7e47d80e1ddacad3 (patch) | |
| tree | a45ab65e275790c0ed853ad4906bcfa3bcd5154d /src/xdiff | |
| parent | 2aa662568a995ccfece490ca0f0f0cbdb9d57560 (diff) | |
| parent | f4ce4c1677819472d1b094ef31b8db9c2549e55e (diff) | |
| download | rneovim-89db07556dbdce97c0c150ed7e47d80e1ddacad3.tar.gz rneovim-89db07556dbdce97c0c150ed7e47d80e1ddacad3.tar.bz2 rneovim-89db07556dbdce97c0c150ed7e47d80e1ddacad3.zip | |
Merge pull request #15630 from zeertzjq/vim-8.2.3424
vim-patch:8.1.{1071,1078,1079,1110},8.2.{2640,3424,3425,3437}
Diffstat (limited to 'src/xdiff')
| -rw-r--r-- | src/xdiff/xemit.c | 2 | ||||
| -rw-r--r-- | src/xdiff/xutils.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/xdiff/xemit.c b/src/xdiff/xemit.c index a0078f928c..b578e7a9d5 100644 --- a/src/xdiff/xemit.c +++ b/src/xdiff/xemit.c @@ -31,7 +31,7 @@ static long xdl_get_rec(xdfile_t *xdf, long ri, char const **rec) { static int xdl_emit_record(xdfile_t *xdf, long ri, char const *pre, xdemitcb_t *ecb) { - long size, psize = strlen(pre); + long size, psize = (long)strlen(pre); char const *rec; size = xdl_get_rec(xdf, ri, &rec); diff --git a/src/xdiff/xutils.c b/src/xdiff/xutils.c index 5ef519155d..f13a854536 100644 --- a/src/xdiff/xutils.c +++ b/src/xdiff/xutils.c @@ -47,7 +47,7 @@ int xdl_emit_diffrec(char const *rec, long size, char const *pre, long psize, mb[1].size = size; if (size > 0 && rec[size - 1] != '\n') { mb[2].ptr = (char *) "\n\\ No newline at end of file\n"; - mb[2].size = strlen(mb[2].ptr); + mb[2].size = (long)strlen(mb[2].ptr); i++; } if (ecb->out_line(ecb->priv, mb, i) < 0) { |