neovim

commit 7f9fc2fbf03e18c1e4033763be4905707d7a84e7
parent e0eb4188bfabefac54dd7cdcfe57fbb6ddb724b5
Author: dundargoc <gocdundar@gmail.com>
Date:   Wed, 27 Dec 2023 11:18:45 +0100

refactor: remove unnecessary HAVE_PATHDEF macro

Diffstat:
M
src/nvim/os/env.c
 | 
7
+------
M
src/nvim/os/os.h
 | 
6
------
M
src/nvim/version.c
 | 
2
--

3 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/src/nvim/os/env.c b/src/nvim/os/env.c
@@ -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).
diff --git a/src/nvim/os/os.h b/src/nvim/os/os.h
@@ -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
diff --git a/src/nvim/version.c b/src/nvim/version.c
@@ -2706,7 +2706,6 @@ void list_version(void)
     version_msg("\"\n");
 #endif
 
-#ifdef HAVE_PATHDEF
     if (*default_vim_dir != NUL) {
       version_msg(_("  fall-back for $VIM: \""));
       version_msg(default_vim_dir);
@@ -2718,7 +2717,6 @@ void list_version(void)
       version_msg(default_vimruntime_dir);
       version_msg("\"\n");
     }
-#endif
   }
 
   version_msg(p_verbose > 0