diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-01-20 17:18:32 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-01-20 17:18:32 +0100 |
| commit | 0daaa49586ff49584946cdf96549e1331f055103 (patch) | |
| tree | adbf6bce58de5f8280ecf496728edd6f38bdfa58 /src/nvim/path.c | |
| parent | ee84da358c27b9c0a6bbd49424bc9d04bb98d662 (diff) | |
| parent | 10b1738f590fe08675173071b35fface324f4048 (diff) | |
| download | rneovim-0daaa49586ff49584946cdf96549e1331f055103.tar.gz rneovim-0daaa49586ff49584946cdf96549e1331f055103.tar.bz2 rneovim-0daaa49586ff49584946cdf96549e1331f055103.zip | |
Merge #7863 'mingw64: fix gcc warnings'
Diffstat (limited to 'src/nvim/path.c')
| -rw-r--r-- | src/nvim/path.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/path.c b/src/nvim/path.c index 51adcfb135..09cede8805 100644 --- a/src/nvim/path.c +++ b/src/nvim/path.c @@ -332,7 +332,7 @@ int path_fnamencmp(const char *const fname1, const char *const fname2, && (p_fic ? (c1 != c2 && CH_FOLD(c1) != CH_FOLD(c2)) : c1 != c2)) { break; } - len -= MB_PTR2LEN((const char_u *)p1); + len -= (size_t)MB_PTR2LEN((const char_u *)p1); p1 += MB_PTR2LEN((const char_u *)p1); p2 += MB_PTR2LEN((const char_u *)p2); } @@ -1691,7 +1691,7 @@ int vim_FullName(const char *fname, char *buf, size_t len, bool force) if (strlen(fname) > (len - 1)) { xstrlcpy(buf, fname, len); // truncate #ifdef WIN32 - slash_adjust(buf); + slash_adjust((char_u *)buf); #endif return FAIL; } @@ -1706,7 +1706,7 @@ int vim_FullName(const char *fname, char *buf, size_t len, bool force) xstrlcpy(buf, fname, len); // something failed; use the filename } #ifdef WIN32 - slash_adjust(buf); + slash_adjust((char_u *)buf); #endif return rv; } @@ -1741,7 +1741,7 @@ char *fix_fname(const char *fname) path_fix_case((char_u *)fname); // set correct case for file name # endif - return fname; + return (char *)fname; #endif } |