# HG changeset patch # User Bram Moolenaar # Date 1604146504 -3600 # Node ID 5608a414418819a74ad87bf96a059d781d0da29f # Parent 7aa62600a2cb0515c1b75ac7845471cce0ec6df7 patch 8.2.1929: MS-Windows: problem loading Perl 5.32 Commit: https://github.com/vim/vim/commit/0289065e41ce3148f929e16a55aa3b161c80576f Author: Bram Moolenaar Date: Sat Oct 31 13:05:11 2020 +0100 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 https://github.com/vim/vim/issues/7234) diff --git a/src/if_perl.xs b/src/if_perl.xs --- 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 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1929, +/**/ 1928, /**/ 1927,