# HG changeset patch # User Bram Moolenaar # Date 1599767103 -7200 # Node ID 36af5cb8413c49dc86defd60e25fd785eb1fa50c # Parent e5e86e7ef6088c5484fa2631444e321d72075ea3 patch 8.2.1655: cannot build with Strawberry Perl 5.32.0 Commit: https://github.com/vim/vim/commit/895a7a472d2eb4413e63cdad3213cb1ef1633458 Author: Bram Moolenaar Date: Thu Sep 10 21:36:11 2020 +0200 patch 8.2.1655: cannot build with Strawberry Perl 5.32.0 Problem: Cannot build with Strawberry Perl 5.32.0. Solution: Use Perl_sv_2pvbyte_flags. (closes https://github.com/vim/vim/issues/6921) diff --git a/src/if_perl.xs b/src/if_perl.xs --- a/src/if_perl.xs +++ b/src/if_perl.xs @@ -241,6 +241,9 @@ typedef int perl_key; # else # define Perl_sv_2pv dll_Perl_sv_2pv # endif +# if (PERL_REVISION == 5) && (PERL_VERSION >= 32) +# define Perl_sv_2pvbyte_flags dll_Perl_sv_2pvbyte_flags +# endif # define Perl_sv_2pvbyte dll_Perl_sv_2pvbyte # define Perl_sv_bless dll_Perl_sv_bless # if (PERL_REVISION == 5) && (PERL_VERSION >= 8) @@ -397,6 +400,9 @@ static char* (*Perl_sv_2pv_nolen)(pTHX_ static char* (*Perl_sv_2pv)(pTHX_ SV*, STRLEN*); # endif static char* (*Perl_sv_2pvbyte)(pTHX_ SV*, STRLEN*); +# if (PERL_REVISION == 5) && (PERL_VERSION >= 32) +static char* (*Perl_sv_2pvbyte_flags)(pTHX_ SV*, STRLEN*, I32); +# endif static SV* (*Perl_sv_bless)(pTHX_ SV*, HV*); # if (PERL_REVISION == 5) && (PERL_VERSION >= 8) static void (*Perl_sv_catpvn_flags)(pTHX_ SV* , const char*, STRLEN, I32); @@ -553,6 +559,9 @@ static struct { {"Perl_sv_2pv", (PERL_PROC*)&Perl_sv_2pv}, # endif {"Perl_sv_2pvbyte", (PERL_PROC*)&Perl_sv_2pvbyte}, +# if (PERL_REVISION == 5) && (PERL_VERSION >= 32) + {"Perl_sv_2pvbyte_flags", (PERL_PROC*)&Perl_sv_2pvbyte_flags}, +# endif # ifdef PERL589_OR_LATER {"Perl_sv_2iv_flags", (PERL_PROC*)&Perl_sv_2iv_flags}, {"Perl_newXS_flags", (PERL_PROC*)&Perl_newXS_flags}, diff --git a/src/version.c b/src/version.c --- 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 */ /**/ + 1655, +/**/ 1654, /**/ 1653,