diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-01-06 21:22:09 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-01-06 21:22:09 +0100 |
| commit | e73b38f8e10c220a382270f69e24cad08d3bf792 (patch) | |
| tree | a4b8e8bfd1d551248c7bff8d029bbef37b862f25 | |
| parent | 7b94e77132eabdf0e43abca57e2ffeb961545174 (diff) | |
| download | vim-git-e73b38f8e10c220a382270f69e24cad08d3bf792.tar.gz | |
patch 8.2.0094: MS-Windows: cannot build with Strawberry Perl 5.30v8.2.0094
Problem: MS-Windows: cannot build with Strawberry Perl 5.30.
Solution: Define __builtin_expect() as a workaround. (Ken Takata,
closes #5267)
| -rw-r--r-- | src/if_perl.xs | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/if_perl.xs b/src/if_perl.xs index 099d38677..fd9d3d730 100644 --- a/src/if_perl.xs +++ b/src/if_perl.xs @@ -47,6 +47,9 @@ /* Work around for using MSVC and ActivePerl 5.18. */ #ifdef _MSC_VER # define __inline__ __inline + +// Work around for using MSVC and Strawberry Perl 5.30. +# define __builtin_expect(expr, val) (expr) #endif #ifdef __GNUC__ diff --git a/src/version.c b/src/version.c index 36dee83d2..41a6d3701 100644 --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 94, +/**/ 93, /**/ 92, |