diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-04-05 19:09:05 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-04-05 19:09:05 +0200 |
| commit | b8ed3aa9e708ec0af4e9ee8921ad198f0e949c0d (patch) | |
| tree | da85e1cbae4e58c85d257f842266ae5b213538de | |
| parent | bdff012f4416c75e65950a19688533c4def5abf6 (diff) | |
| download | vim-git-b8ed3aa9e708ec0af4e9ee8921ad198f0e949c0d.tar.gz | |
patch 8.2.0515: some compilers cannot add to "void *"v8.2.0515
Problem: Some compilers cannot add to "void *".
Solution: Cast to "char *".
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9compile.c | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/version.c b/src/version.c index f881c1fb2..078775ca6 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 515, +/**/ 514, /**/ 513, diff --git a/src/vim9compile.c b/src/vim9compile.c index 51014569e..526f25b80 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -368,7 +368,8 @@ func_type_add_arg_types( functype->tt_args = ALLOC_CLEAR_MULT(type_T *, argcount); if (functype->tt_args == NULL) return FAIL; - ((type_T **)type_gap->ga_data)[type_gap->ga_len] = (void *)functype->tt_args; + ((type_T **)type_gap->ga_data)[type_gap->ga_len] = + (void *)functype->tt_args; ++type_gap->ga_len; functype->tt_argcount = argcount; @@ -1846,7 +1847,7 @@ type_name(type_T *type, char **tofree) if (i > 0) { - STRCPY(ga.ga_data + ga.ga_len, ", "); + STRCPY((char *)ga.ga_data + ga.ga_len, ", "); ga.ga_len += 2; } len = (int)STRLEN(arg_type); @@ -1856,13 +1857,13 @@ type_name(type_T *type, char **tofree) return "[unknown]"; } *tofree = ga.ga_data; - STRCPY(ga.ga_data + ga.ga_len, arg_type); + STRCPY((char *)ga.ga_data + ga.ga_len, arg_type); ga.ga_len += len; vim_free(arg_free); } if (type->tt_member == &t_void) - STRCPY(ga.ga_data + ga.ga_len, ")"); + STRCPY((char *)ga.ga_data + ga.ga_len, ")"); else { char *ret_free; @@ -1876,8 +1877,8 @@ type_name(type_T *type, char **tofree) return "[unknown]"; } *tofree = ga.ga_data; - STRCPY(ga.ga_data + ga.ga_len, "): "); - STRCPY(ga.ga_data + ga.ga_len + 3, ret_name); + STRCPY((char *)ga.ga_data + ga.ga_len, "): "); + STRCPY((char *)ga.ga_data + ga.ga_len + 3, ret_name); vim_free(ret_free); } return ga.ga_data; |