diff options
| author | Philip H <47042125+pheiduck@users.noreply.github.com> | 2023-06-22 08:55:47 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2023-08-09 19:58:58 +0200 |
| commit | 1d7caa58e3c87f75a4becbceabbd1af181ace11e (patch) | |
| tree | 5e9f3ddcfa29ccfd09fae1c5b0bfd33d59ef4c87 | |
| parent | 335c58494089ff4ef698f059ded6215f69c02bcf (diff) | |
patch 9.0.1681: Build Failure with Perl 5.38v9.0.1681
Problem: Build Failure with Perl 5.38
Solution: Fix Build Failure
closes: #12543, closes: #12575
| -rw-r--r-- | .github/workflows/ci.yml | 1 | ||||
| -rw-r--r-- | ci/config.mk.sed | 2 | ||||
| -rw-r--r-- | src/if_perl.xs | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 10 insertions, 9 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3481bcb8fc..47c68ea7d7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -276,7 +276,6 @@ jobs: run: | brew install lua echo "LUA_PREFIX=/usr/local" >> $GITHUB_ENV - brew uninstall perl - name: Set up environment run: | diff --git a/ci/config.mk.sed b/ci/config.mk.sed index 51e7ec903d..f672edd9e4 100644 --- a/ci/config.mk.sed +++ b/ci/config.mk.sed @@ -1,3 +1,3 @@ /^CFLAGS[[:blank:]]*=/s/$/ -Wall -Wextra -Wshadow -Werror/ -/^PERL_CFLAGS_EXTRA[[:blank:]]*=/s/$/ -Wno-error=unused-function/ +/^PERL_CFLAGS_EXTRA[[:blank:]]*=/s/$/ -Wno-error=unused-function -Wno-shadow/ /^RUBY_CFLAGS_EXTRA[[:blank:]]*=/s/$/ -Wno-error=unused-parameter/ diff --git a/src/if_perl.xs b/src/if_perl.xs index c69ed9ef1f..6c1003c411 100644 --- a/src/if_perl.xs +++ b/src/if_perl.xs @@ -40,7 +40,7 @@ /* Work around for perl-5.18. * Don't include "perl\lib\CORE\inline.h" for now, * include it after Perl_sv_free2 is defined. */ -#ifdef DYNAMIC_PERL +#if (PERL_REVISION == 5) && (PERL_VERSION >= 18) # define PERL_NO_INLINE_FUNCTIONS #endif @@ -402,14 +402,14 @@ static bool (*Perl_sv_2bool)(pTHX_ SV*); static IV (*Perl_sv_2iv)(pTHX_ SV*); static SV* (*Perl_sv_2mortal)(pTHX_ SV*); # if (PERL_REVISION == 5) && (PERL_VERSION >= 8) -static char* (*Perl_sv_2pv_flags)(pTHX_ SV*, STRLEN*, I32); +static char* (*Perl_sv_2pv_flags)(pTHX_ SV*, STRLEN* const, const U32); static char* (*Perl_sv_2pv_nolen)(pTHX_ SV*); # else 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); +static char* (*Perl_sv_2pvbyte_flags)(pTHX_ SV*, STRLEN* const, const U32); # endif static SV* (*Perl_sv_bless)(pTHX_ SV*, HV*); # if (PERL_REVISION == 5) && (PERL_VERSION >= 8) @@ -710,7 +710,7 @@ S_POPMARK(pTHX) # endif /* perl-5.34 needs Perl_SvTRUE_common; used in SvTRUE_nomg_NN */ -# if (PERL_REVISION == 5) && (PERL_VERSION >= 34) +# if (PERL_REVISION == 5) && (PERL_VERSION == 34) PERL_STATIC_INLINE bool Perl_SvTRUE_common(pTHX_ SV * sv, const bool sv_2bool_is_fallback) { @@ -737,7 +737,7 @@ Perl_SvTRUE_common(pTHX_ SV * sv, const bool sv_2bool_is_fallback) # endif /* perl-5.32 needs Perl_SvTRUE */ -# if (PERL_REVISION == 5) && (PERL_VERSION >= 32) +# if (PERL_REVISION == 5) && (PERL_VERSION == 32) PERL_STATIC_INLINE bool Perl_SvTRUE(pTHX_ SV *sv) { if (!LIKELY(sv)) @@ -1649,7 +1649,7 @@ Buffers(...) PPCODE: if (items == 0) { - if (GIMME == G_SCALAR) + if (GIMME_V == G_SCALAR) { i = 0; FOR_ALL_BUFFERS(vimbuf) @@ -1700,7 +1700,7 @@ Windows(...) PPCODE: if (items == 0) { - if (GIMME == G_SCALAR) + if (GIMME_V == G_SCALAR) XPUSHs(sv_2mortal(newSViv(win_count()))); else { diff --git a/src/version.c b/src/version.c index cc86bb60de..39f637c185 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1681, +/**/ 1680, /**/ 1679, |