diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/globals.h | 4 | ||||
| -rw-r--r-- | src/nvim/os/env.c | 7 | ||||
| -rw-r--r-- | src/nvim/version.c | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/nvim/globals.h b/src/nvim/globals.h index 9eb70d37df..a8c97c800d 100644 --- a/src/nvim/globals.h +++ b/src/nvim/globals.h @@ -982,8 +982,8 @@ EXTERN char breakat_flags[256]; /* which characters are in 'breakat' */ * Makefile to make their value depend on the Makefile. */ #ifdef HAVE_PATHDEF -extern char_u *default_vim_dir; -extern char_u *default_vimruntime_dir; +extern char *default_vim_dir; +extern char *default_vimruntime_dir; extern char_u *compiled_user; extern char_u *compiled_sys; #endif diff --git a/src/nvim/os/env.c b/src/nvim/os/env.c index 30e44341a9..52c3e0d9cd 100644 --- a/src/nvim/os/env.c +++ b/src/nvim/os/env.c @@ -495,13 +495,14 @@ char_u *vim_getenv(char_u *name, bool *mustfree) if (p == NULL) { /* Only use default_vimruntime_dir when it is not empty */ if (vimruntime && *default_vimruntime_dir != NUL) { - p = default_vimruntime_dir; + p = (char_u *)default_vimruntime_dir; *mustfree = false; } else if (*default_vim_dir != NUL) { - if (vimruntime && (p = vim_version_dir(default_vim_dir)) != NULL) { + if (vimruntime + && (p = vim_version_dir((char_u *)default_vim_dir)) != NULL) { *mustfree = true; } else { - p = default_vim_dir; + p = (char_u *)default_vim_dir; *mustfree = false; } } diff --git a/src/nvim/version.c b/src/nvim/version.c index 1a5eb523fa..49f374bce4 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -915,13 +915,13 @@ void list_version(void) if (*default_vim_dir != NUL) { version_msg(_(" fall-back for $VIM: \"")); - version_msg((char *)default_vim_dir); + version_msg(default_vim_dir); version_msg("\"\n"); } if (*default_vimruntime_dir != NUL) { version_msg(_(" f-b for $VIMRUNTIME: \"")); - version_msg((char *)default_vimruntime_dir); + version_msg(default_vimruntime_dir); version_msg("\"\n"); } #endif // ifdef HAVE_PATHDEF |