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
index 099d38677628745f741d6cd96b301878fb402211..fd9d3d730fbac9ae3cbf79b2613e592b9212109d 100644 (file)
--- 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 36dee83d27fd82b2e67b6379d86501177516685e..41a6d3701299ab9e938d3591e7a6035e92fb0a7b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    94,
 /**/
     93,
 /**/