# HG changeset patch # User Bram Moolenaar # Date 1578342604 -3600 # Node ID d95296021f6e6bf3b9e28d1ee00d9c188a13ed73 # Parent 2379273ec8a9d859e89784db5261e6c6e8fe3e59 patch 8.2.0094: MS-Windows: cannot build with Strawberry Perl 5.30 Commit: https://github.com/vim/vim/commit/e73b38f8e10c220a382270f69e24cad08d3bf792 Author: Bram Moolenaar Date: Mon Jan 6 21:22:09 2020 +0100 patch 8.2.0094: MS-Windows: cannot build with Strawberry Perl 5.30 Problem: MS-Windows: cannot build with Strawberry Perl 5.30. Solution: Define __builtin_expect() as a workaround. (Ken Takata, closes #5267) diff --git a/src/if_perl.xs b/src/if_perl.xs --- 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 --- 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,