aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-16 07:24:23 -04:00
Code Activity

patch 9.1.1842: MS-Windows: build failure when mzscheme is included

Browse Source 
Problem:  MS-Windows: build failure when mzscheme is included
          (dertuxmalwieder, after v9.1.1838)
Solution: skip specific section when PROTO is defined
          (Hirohito Higashi)

fixes: #18529
closes: #18530

Signed-off-by: Hirohito Higashi <h.east.727@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Hirohito Higashi
2025-10-09 19:59:48 +00:00
committed by Christian Brabandt
parent 7dba04f15c
commit 6783021c65
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/if_mzsch.c
View File

@@ -485,14 +485,16 @@ static void (*dll_scheme_set_config_path)(Scheme_Object *p);
# define scheme_set_config_path dll_scheme_set_config_path # define scheme_set_config_path dll_scheme_set_config_path
# endif # endif
# if MZSCHEME_VERSION_MAJOR >= 500 # ifndef PROTO
# if defined(IMPLEMENT_THREAD_LOCAL_VIA_WIN_TLS) || defined(IMPLEMENT_THREAD_LOCAL_EXTERNALLY_VIA_PROC) # if MZSCHEME_VERSION_MAJOR >= 500
# if defined(IMPLEMENT_THREAD_LOCAL_VIA_WIN_TLS) || defined(IMPLEMENT_THREAD_LOCAL_EXTERNALLY_VIA_PROC)
// define as function for macro in schthread.h // define as function for macro in schthread.h
Thread_Local_Variables * Thread_Local_Variables *
scheme_external_get_thread_local_variables(void) scheme_external_get_thread_local_variables(void)
{ {
return dll_scheme_external_get_thread_local_variables(); return dll_scheme_external_get_thread_local_variables();
} }
# endif
# endif # endif
# endif # endif

1
src/proto/if_mzsch.pro
View File

@@ -1,5 +1,4 @@
/* if_mzsch.c */ /* if_mzsch.c */
Thread_Local_Variables *scheme_external_get_thread_local_variables(void);
int mzscheme_enabled(int verbose); int mzscheme_enabled(int verbose);
void mzvim_check_threads(void); void mzvim_check_threads(void);
char *did_set_mzquantum(optset_T *args); char *did_set_mzquantum(optset_T *args);

2
src/version.c
View File

@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1842,
/**/ /**/
1841, 1841,
/**/ /**/