patch 9.1.1842: MS-Windows: build failure when mzscheme is included
Commit:
https://github.com/vim/vim/commit/6783021c657cb81dfd43f74217429f36515b0ffb
Author: Hirohito Higashi <[email protected]>
Date: Thu Oct 9 19:59:48 2025 +0000
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 <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/src/if_mzsch.c b/src/if_mzsch.c
index d4910ae02..634ab00b7 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 c8b327f8e..26ffa77c8 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 55b3c80af..d63dcf21e 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,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1v6x2V-004dk7-Ku%40256bit.org.
