From 0289065e41ce3148f929e16a55aa3b161c80576f Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 31 Oct 2020 13:05:11 +0100 Subject: [PATCH] patch 8.2.1929: MS-Windows: problem loading Perl 5.32 Problem: MS-Windows: problem loading Perl 5.32. Solution: Define NO_THREAD_SAFE_LOCALE. (Ken Takata, closes #7234) --- src/if_perl.xs | 5 +++-- src/version.c | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/if_perl.xs b/src/if_perl.xs index e54a79d2b..999dff50e 100644 --- a/src/if_perl.xs +++ b/src/if_perl.xs @@ -44,12 +44,13 @@ # define PERL_NO_INLINE_FUNCTIONS #endif -/* Work around for using MSVC and ActivePerl 5.18. */ #ifdef _MSC_VER +// Work around for using MSVC and ActivePerl 5.18. # define __inline__ __inline - // Work around for using MSVC and Strawberry Perl 5.30. # define __builtin_expect(expr, val) (expr) +// Work around for using MSVC and Strawberry Perl 5.32. +# define NO_THREAD_SAFE_LOCALE #endif #ifdef __GNUC__ diff --git a/src/version.c b/src/version.c index 65040460f..9f23c1d2e 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1929, /**/ 1928, /**/ -- 2.40.0