Skip to content

Commit 6783021

Browse files
h-eastchrisbra
authored andcommitted
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>
1 parent 7dba04f commit 6783021

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

src/if_mzsch.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -485,14 +485,16 @@ static void (*dll_scheme_set_config_path)(Scheme_Object *p);
485485
# define scheme_set_config_path dll_scheme_set_config_path
486486
# endif
487487

488-
# if MZSCHEME_VERSION_MAJOR >= 500
489-
# if defined(IMPLEMENT_THREAD_LOCAL_VIA_WIN_TLS) || defined(IMPLEMENT_THREAD_LOCAL_EXTERNALLY_VIA_PROC)
488+
# ifndef PROTO
489+
# if MZSCHEME_VERSION_MAJOR >= 500
490+
# if defined(IMPLEMENT_THREAD_LOCAL_VIA_WIN_TLS) || defined(IMPLEMENT_THREAD_LOCAL_EXTERNALLY_VIA_PROC)
490491
// define as function for macro in schthread.h
491492
Thread_Local_Variables *
492493
scheme_external_get_thread_local_variables(void)
493494
{
494495
return dll_scheme_external_get_thread_local_variables();
495496
}
497+
# endif
496498
# endif
497499
# endif
498500

src/proto/if_mzsch.pro

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/* if_mzsch.c */
2-
Thread_Local_Variables *scheme_external_get_thread_local_variables(void);
32
int mzscheme_enabled(int verbose);
43
void mzvim_check_threads(void);
54
char *did_set_mzquantum(optset_T *args);

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -729,6 +729,8 @@ static char *(features[]) =
729729

730730
static int included_patches[] =
731731
{ /* Add new patch number below this line */
732+
/**/
733+
1842,
732734
/**/
733735
1841,
734736
/**/

0 commit comments

Comments
 (0)