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 <h.east.727@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/if_mzsch.c b/src/if_mzsch.c
index d4910ae026c26e4952af4a4209f5c81a6c0691cc..634ab00b7084de5cdbc6f094b5ffa1042a2f4f9b 100644 (file)
--- 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 c8b327f8efa486fdc57aa1bc18e40e4ebcacaf2d..26ffa77c8705614127915c522b0508bcf1fcbce2 100644 (file)
--- 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 55b3c80af7aaaeac17e90be8b4baa00a645c6f6e..d63dcf21e90b3f78ae04f150b0bbf8dad75b010b 100644 (file)
--- 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,
 /**/