diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-02-18 20:54:15 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-02-18 20:54:15 -0500 |
| commit | b1d079c83b3dd459114d1ba7c2ff1b07a9ee3e9e (patch) | |
| tree | e80358ae4795597680b45fe984dc5f2e9ce20237 /src/nvim/path.c | |
| parent | 366662d932551e558d10f09887ddf144ed5db34b (diff) | |
| parent | 36340803afe1504f15468a715172c25cfef6974c (diff) | |
| download | rneovim-b1d079c83b3dd459114d1ba7c2ff1b07a9ee3e9e.tar.gz rneovim-b1d079c83b3dd459114d1ba7c2ff1b07a9ee3e9e.tar.bz2 rneovim-b1d079c83b3dd459114d1ba7c2ff1b07a9ee3e9e.zip | |
Merge #1979 'Enable -Wconversion'
Diffstat (limited to 'src/nvim/path.c')
| -rw-r--r-- | src/nvim/path.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/nvim/path.c b/src/nvim/path.c index e5f78440c2..93aa5eed3d 100644 --- a/src/nvim/path.c +++ b/src/nvim/path.c @@ -297,7 +297,7 @@ int vim_fnamecmp(char_u *x, char_u *y) return vim_fnamencmp(x, y, MAXPATHL); #else if (p_fic) - return MB_STRICMP(x, y); + return mb_stricmp(x, y); return STRCMP(x, y); #endif } @@ -327,7 +327,7 @@ int vim_fnamencmp(char_u *x, char_u *y, size_t len) return cx - cy; #else if (p_fic) - return MB_STRNICMP(x, y, len); + return mb_strnicmp(x, y, len); return STRNCMP(x, y, len); #endif } @@ -578,16 +578,6 @@ unix_expandpath ( if (*path_end != NUL) backslash_halve(buf + len + 1); if (os_file_exists(buf)) { /* add existing file */ -#ifdef MACOS_CONVERT - size_t precomp_len = STRLEN(buf)+1; - char_u *precomp_buf = - mac_precompose_path(buf, precomp_len, &precomp_len); - - if (precomp_buf) { - memmove(buf, precomp_buf, precomp_len); - free(precomp_buf); - } -#endif addfile(gap, buf, flags); } } |