Mercurial > vim
changeset 15390:00aa76a735e7 v8.1.0703
patch 8.1.0703: compiler warnings with 64-bit compiler
commit https://github.com/vim/vim/commit/8aef43b66cf280c79a75d81f43ce5223b9044e63
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Jan 8 20:14:35 2019 +0100
patch 8.1.0703: compiler warnings with 64-bit compiler
Problem: Compiler warnings with 64-bit compiler.
Solution: Change types, add type casts. (Mike Williams)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 08 Jan 2019 20:15:07 +0100 |
| parents | 0351fa7879f9 |
| children | ba6f0883380b |
| files | src/textprop.c src/undo.c src/version.c |
| diffstat | 3 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/textprop.c +++ b/src/textprop.c @@ -357,12 +357,12 @@ get_text_props(buf_T *buf, linenr_T lnum static void set_text_props(linenr_T lnum, char_u *props, int len) { - char_u *text; - char_u *newtext; - size_t textlen; + char_u *text; + char_u *newtext; + int textlen; text = ml_get(lnum); - textlen = STRLEN(text) + 1; + textlen = (int)STRLEN(text) + 1; newtext = alloc(textlen + len); if (newtext == NULL) return;
--- a/src/undo.c +++ b/src/undo.c @@ -1205,9 +1205,10 @@ serialize_header(bufinfo_T *bi, char_u * /* buffer-specific data */ undo_write_bytes(bi, (long_u)buf->b_ml.ml_line_count, 4); len = buf->b_u_line_ptr.ul_line == NULL - ? 0 : STRLEN(buf->b_u_line_ptr.ul_line); + ? 0L : (long)STRLEN(buf->b_u_line_ptr.ul_line); undo_write_bytes(bi, (long_u)len, 4); - if (len > 0 && fwrite_crypt(bi, buf->b_u_line_ptr.ul_line, (size_t)len) == FAIL) + if (len > 0 && fwrite_crypt(bi, buf->b_u_line_ptr.ul_line, (size_t)len) + == FAIL) return FAIL; undo_write_bytes(bi, (long_u)buf->b_u_line_lnum, 4); undo_write_bytes(bi, (long_u)buf->b_u_line_colnr, 4);