diff options
author | Bram Moolenaar <Bram@vim.org> | 2020-07-26 15:55:25 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2020-07-26 15:55:25 +0200 |
commit | d3bb6a82a51d549bbd597bb4e94d8f074009be2a (patch) | |
tree | f27f9a197d2fba9550309e727de2e53a2513892f /src | |
parent | cb4f69c2fd9ea81331c4aa54877fde612d182a51 (diff) |
patch 8.2.1299: compiler warning for using size_t for int and void pointerv8.2.1299
Problem: Compiler warning for using size_t for int and void pointer.
Solution: Add type casts.
Diffstat (limited to 'src')
-rw-r--r-- | src/scriptfile.c | 8 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/scriptfile.c b/src/scriptfile.c index 2a8320832e..b93e351380 100644 --- a/src/scriptfile.c +++ b/src/scriptfile.c @@ -157,18 +157,18 @@ estack_sfile(int is_sfile UNUSED) last_type = entry->es_type; } len += STRLEN(type_name); - if (ga_grow(&ga, len) == FAIL) + if (ga_grow(&ga, (int)len) == FAIL) break; if (idx == exestack.ga_len - 1 || entry->es_lnum == 0) // For the bottom entry: do not add the line number, it is used // in <slnum>. Also leave it out when the number is not set. - vim_snprintf(ga.ga_data + ga.ga_len, len, "%s%s%s", + vim_snprintf((char *)ga.ga_data + ga.ga_len, len, "%s%s%s", type_name, entry->es_name, idx == exestack.ga_len - 1 ? "" : ".."); else - vim_snprintf(ga.ga_data + ga.ga_len, len, "%s%s[%ld]..", + vim_snprintf((char *)ga.ga_data + ga.ga_len, len, "%s%s[%ld]..", type_name, entry->es_name, entry->es_lnum); - ga.ga_len += STRLEN(ga.ga_data + ga.ga_len); + ga.ga_len += (int)STRLEN((char *)ga.ga_data + ga.ga_len); } } diff --git a/src/version.c b/src/version.c index 58a434a1b6..93bcc43247 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1299, +/**/ 1298, /**/ 1297, |