diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-01-08 20:14:35 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-01-08 20:14:35 +0100 |
| commit | 8aef43b66cf280c79a75d81f43ce5223b9044e63 (patch) | |
| tree | b9c130e77c86b18c7da28805d654734c35aebee9 | |
| parent | b589f95b38ddd779d7e696abb0ea011dc92ea903 (diff) | |
patch 8.1.0703: compiler warnings with 64-bit compilerv8.1.0703
Problem: Compiler warnings with 64-bit compiler.
Solution: Change types, add type casts. (Mike Williams)
| -rw-r--r-- | src/textprop.c | 8 | ||||
| -rw-r--r-- | src/undo.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/src/textprop.c b/src/textprop.c index 8b7d3f15ed..389bd41c1a 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -357,12 +357,12 @@ get_text_props(buf_T *buf, linenr_T lnum, char_u **props, int will_change) 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; diff --git a/src/undo.c b/src/undo.c index 0a015e65b0..0cb07a3ada 100644 --- a/src/undo.c +++ b/src/undo.c @@ -1205,9 +1205,10 @@ serialize_header(bufinfo_T *bi, char_u *hash) /* 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); diff --git a/src/version.c b/src/version.c index 13f7909e40..0693be11db 100644 --- a/src/version.c +++ b/src/version.c @@ -800,6 +800,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 703, +/**/ 702, /**/ 701, |