diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-10-31 13:05:11 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-10-31 13:05:11 +0100 |
| commit | 0289065e41ce3148f929e16a55aa3b161c80576f (patch) | |
| tree | 1dc1359a380d567b437484fba740d2375104b2a7 | |
| parent | cd030c4b604bea92311e9c418aefe5143dee9201 (diff) | |
| download | vim-git-0289065e41ce3148f929e16a55aa3b161c80576f.tar.gz | |
patch 8.2.1929: MS-Windows: problem loading Perl 5.32v8.2.1929
Problem: MS-Windows: problem loading Perl 5.32.
Solution: Define NO_THREAD_SAFE_LOCALE. (Ken Takata, closes #7234)
| -rw-r--r-- | src/if_perl.xs | 5 | ||||
| -rw-r--r-- | 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 @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1929, +/**/ 1928, /**/ 1927, |