From 5c5c9801b1e28050a40cef80aeba1ecdea6ea411 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 10 Jul 2015 16:12:48 +0200 Subject: patch 7.4.772 Problem: Racket 6.2 is not supported on MS-Windows. Solution: Check for the "racket" subdirectory. (Weiyong Mao) --- src/if_mzsch.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/if_mzsch.c') diff --git a/src/if_mzsch.c b/src/if_mzsch.c index 8dd213431..2135446ed 100644 --- a/src/if_mzsch.c +++ b/src/if_mzsch.c @@ -851,7 +851,13 @@ mzscheme_end(void) #endif } -#if MZSCHEME_VERSION_MAJOR >= 500 && defined(WIN32) && defined(USE_THREAD_LOCAL) +/* + * scheme_register_tls_space is only available on 32-bit Windows. + * See http://docs.racket-lang.org/inside/im_memoryalloc.html?q=scheme_register_tls_space + */ +#if MZSCHEME_VERSION_MAJOR >= 500 && defined(WIN32) \ + && defined(USE_THREAD_LOCAL) && !defined(_WIN64) +# define HAVE_TLS_SPACE 1 static __declspec(thread) void *tls_space; #endif @@ -870,7 +876,7 @@ static __declspec(thread) void *tls_space; int mzscheme_main(int argc, char** argv) { -#if MZSCHEME_VERSION_MAJOR >= 500 && defined(WIN32) && defined(USE_THREAD_LOCAL) +#ifdef HAVE_TLS_SPACE scheme_register_tls_space(&tls_space, 0); #endif #ifdef TRAMPOLINED_MZVIM_STARTUP -- cgit v1.2.1