From 6783021c657cb81dfd43f74217429f36515b0ffb Mon Sep 17 00:00:00 2001 From: Hirohito Higashi Date: Thu, 9 Oct 2025 19:59:48 +0000 Subject: [PATCH] patch 9.1.1842: MS-Windows: build failure when mzscheme is included 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 Signed-off-by: Christian Brabandt --- src/if_mzsch.c | 6 ++++-- src/proto/if_mzsch.pro | 1 - src/version.c | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/if_mzsch.c b/src/if_mzsch.c index d4910ae026..634ab00b70 100644 --- a/src/if_mzsch.c +++ b/src/if_mzsch.c @@ -485,14 +485,16 @@ static void (*dll_scheme_set_config_path)(Scheme_Object *p); # define scheme_set_config_path dll_scheme_set_config_path # endif -# if MZSCHEME_VERSION_MAJOR >= 500 -# if defined(IMPLEMENT_THREAD_LOCAL_VIA_WIN_TLS) || defined(IMPLEMENT_THREAD_LOCAL_EXTERNALLY_VIA_PROC) +# ifndef PROTO +# 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 Thread_Local_Variables * scheme_external_get_thread_local_variables(void) { return dll_scheme_external_get_thread_local_variables(); } +# endif # endif # endif diff --git a/src/proto/if_mzsch.pro b/src/proto/if_mzsch.pro index c8b327f8ef..26ffa77c87 100644 --- a/src/proto/if_mzsch.pro +++ b/src/proto/if_mzsch.pro @@ -1,5 +1,4 @@ /* if_mzsch.c */ -Thread_Local_Variables *scheme_external_get_thread_local_variables(void); int mzscheme_enabled(int verbose); void mzvim_check_threads(void); char *did_set_mzquantum(optset_T *args); diff --git a/src/version.c b/src/version.c index 55b3c80af7..d63dcf21e9 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1842, /**/ 1841, /**/