diff options
| author | Bram Moolenaar <bram@vim.org> | 2011-06-12 21:25:00 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2011-06-12 21:25:00 +0200 |
| commit | a90798b8816afb795b2a01c01854190d3b9a6f65 (patch) | |
| tree | 05a10e7a5f30a5bc9419bec65a555f94d126dade | |
| parent | e0b1c33d282ca3a31c528b1b469224137a43d9cc (diff) | |
| download | vim-a90798b8816afb795b2a01c01854190d3b9a6f65.tar.gz | |
Problem: Compiler warning.
Solution: Add type cast.
| -rw-r--r-- | src/if_cscope.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/if_cscope.c b/src/if_cscope.c index f9e318dd..929448bc 100644 --- a/src/if_cscope.c +++ b/src/if_cscope.c @@ -2518,7 +2518,7 @@ cs_resolve_file(i, name) /* Check for csdir to be non empty to avoid empty path concatenated to * cscope output. TODO: avoid the unnecessary alloc/free of fullname. */ vim_free(fullname); - fullname = concat_fnames(csdir, (char_u *)name, TRUE); + fullname = (char *)concat_fnames(csdir, (char_u *)name, TRUE); } else (void)sprintf(fullname, "%s", name); diff --git a/src/version.c b/src/version.c index 1033b748..650eafcd 100644 --- a/src/version.c +++ b/src/version.c @@ -710,6 +710,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 211, +/**/ 210, /**/ 209, |