Mercurial > vim

changeset 19067:d95296021f6e v8.2.0094

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.0094: MS-Windows: cannot build with Strawberry Perl 5.30 Commit: https://github.com/vim/vim/commit/e73b38f8e10c220a382270f69e24cad08d3bf792 Author: Bram Moolenaar <Bram@vim.org> 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)
author Bram Moolenaar <Bram@vim.org>
date Mon, 06 Jan 2020 21:30:04 +0100
parents 2379273ec8a9
children ef88c759f4a0
files src/if_perl.xs src/version.c
diffstat 2 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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__
--- 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,