vim-patch:8.2.3437: compiler warnings for 32/64 bit usage

Problem:    Compiler warnings for 32/64 bit usage.
Solution:   Add type casts. (Mike Williams, closes vim/vim#8870)
f5785cf059
This commit is contained in:
zeertzjq 2021-09-19 13:13:44 +08:00
parent a348c666a3
commit f4ce4c1677
3 changed files with 4 additions and 4 deletions

View File

@ -3558,7 +3558,7 @@ static char_u *set_chars_option(win_T *wp, char_u **varp, bool set)
} }
} }
if (*s == ',' || *s == NUL) { if (*s == ',' || *s == NUL) {
if (round) { if (round > 0) {
if (tab[i].cp == &wp->w_p_lcs_chars.tab2) { if (tab[i].cp == &wp->w_p_lcs_chars.tab2) {
wp->w_p_lcs_chars.tab1 = c1; wp->w_p_lcs_chars.tab1 = c1;
wp->w_p_lcs_chars.tab2 = c2; wp->w_p_lcs_chars.tab2 = c2;
@ -3574,7 +3574,7 @@ static char_u *set_chars_option(win_T *wp, char_u **varp, bool set)
} }
if (i == entries) { if (i == entries) {
len = STRLEN("multispace"); len = (int)STRLEN("multispace");
if ((varp == &p_lcs || varp == &wp->w_p_lcs) if ((varp == &p_lcs || varp == &wp->w_p_lcs)
&& STRNCMP(p, "multispace", len) == 0 && STRNCMP(p, "multispace", len) == 0
&& p[len] == ':' && p[len] == ':'

View File

@ -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) { 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; char const *rec;
size = xdl_get_rec(xdf, ri, &rec); size = xdl_get_rec(xdf, ri, &rec);

View File

@ -47,7 +47,7 @@ int xdl_emit_diffrec(char const *rec, long size, char const *pre, long psize,
mb[1].size = size; mb[1].size = size;
if (size > 0 && rec[size - 1] != '\n') { if (size > 0 && rec[size - 1] != '\n') {
mb[2].ptr = (char *) "\n\\ No newline at end of file\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++; i++;
} }
if (ecb->out_line(ecb->priv, mb, i) < 0) { if (ecb->out_line(ecb->priv, mb, i) < 0) {