mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-08-30 19:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove unnecessary HAVE_PATHDEF macro

Browse Source
This commit is contained in:
dundargoc
2023-12-27 11:18:45 +01:00
committed by dundargoc
parent e0eb4188bf
commit 7f9fc2fbf0
3 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/os/env.c
View File

@@ -919,10 +919,7 @@ char *vim_getenv(const char *name)
// Don't do this when default_vimruntime_dir is non-empty.
char *vim_path = NULL;
if (vimruntime
#ifdef HAVE_PATHDEF
&& *default_vimruntime_dir == NUL
#endif
) {
&& *default_vimruntime_dir == NUL) {
kos_env_path = os_getenv("VIM");
if (kos_env_path != NULL) {
vim_path = vim_version_dir(kos_env_path);
@@ -981,7 +978,6 @@ char *vim_getenv(const char *name)
assert(vim_path != exe_name);
}
#ifdef HAVE_PATHDEF
// When there is a pathdef.c file we can use default_vim_dir and
// default_vimruntime_dir
if (vim_path == NULL) {
@@ -995,7 +991,6 @@ char *vim_getenv(const char *name)
}
}
}
#endif
// Set the environment variable, so that the new value can be found fast
// next time, and others can also use it (e.g. Perl).

6
src/nvim/os/os.h
View File

@@ -10,15 +10,9 @@
#include "nvim/os/stdpaths_defs.h" // IWYU pragma: keep
#include "nvim/types_defs.h" // IWYU pragma: keep
#define HAVE_PATHDEF
// Some file names are stored in pathdef.c, which is generated from the
// Makefile to make their value depend on the Makefile.
#ifdef HAVE_PATHDEF
extern char *default_vim_dir;
extern char *default_vimruntime_dir;
extern char *default_lib_dir;
#endif
#ifdef INCLUDE_GENERATED_DECLARATIONS
// IWYU pragma: begin_exports