Mercurial > vim
diff src/if_tcl.c @ 33531:1a769647d661
patch 9.0.2013: confusing ifdefs in if_<lang>.c
Commit: https://github.com/vim/vim/commit/c97b3febc82c1ccacf5f328ed0bd81c8b850e97d
Author: Ken Takata <kentkt@csc.jp>
Date: Wed Oct 11 21:27:06 2023 +0200
patch 9.0.2013: confusing ifdefs in if_<lang>.c
Problem: confusing ifdefs in if_<lang>.c
Solution: refactor ifndefs to #ifdefs
if_x: Avoid using #ifndef - #else - #endif
Using #ifndef - #else - #endif is sometimes confusing.
Use #ifdef - #else - #endif instead.
closes: #13310
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Ken Takata <kentkt@csc.jp>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 11 Oct 2023 21:30:11 +0200 |
| parents | 9b35b4c6df4c |
| children | daaff6843090 |
line wrap: on
line diff
--- a/src/if_tcl.c +++ b/src/if_tcl.c @@ -160,7 +160,13 @@ static struct ref refsdeleted; // dummy typedef int HANDLE; # endif -# ifndef MSWIN +# ifdef MSWIN +# define TCL_PROC FARPROC +# define load_dll vimLoadLib +# define symbol_from_dll GetProcAddress +# define close_dll FreeLibrary +# define load_dll_error GetWin32Error +# else # include <dlfcn.h> # define HANDLE void* # define TCL_PROC void* @@ -168,12 +174,6 @@ typedef int HANDLE; # define symbol_from_dll dlsym # define close_dll dlclose # define load_dll_error dlerror -# else -# define TCL_PROC FARPROC -# define load_dll vimLoadLib -# define symbol_from_dll GetProcAddress -# define close_dll FreeLibrary -# define load_dll_error GetWin32Error # endif /* @@ -242,10 +242,10 @@ static char *find_executable_arg = NULL; void vim_tcl_init(char *arg) { -#ifndef DYNAMIC_TCL +#ifdef DYNAMIC_TCL + find_executable_arg = arg; +#else Tcl_FindExecutable(arg); -#else - find_executable_arg = arg; #endif }