mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
patch 9.0.1681: Build Failure with Perl 5.38
Problem: Build Failure with Perl 5.38 Solution: Fix Build Failure closes: #12543, closes: #12575
This commit is contained in:
parent
335c584940
commit
1d7caa58e3
1
.github/workflows/ci.yml
vendored
1
.github/workflows/ci.yml
vendored
@ -276,7 +276,6 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
brew install lua
|
brew install lua
|
||||||
echo "LUA_PREFIX=/usr/local" >> $GITHUB_ENV
|
echo "LUA_PREFIX=/usr/local" >> $GITHUB_ENV
|
||||||
brew uninstall perl
|
|
||||||
|
|
||||||
- name: Set up environment
|
- name: Set up environment
|
||||||
run: |
|
run: |
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
/^CFLAGS[[:blank:]]*=/s/$/ -Wall -Wextra -Wshadow -Werror/
|
/^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/
|
/^RUBY_CFLAGS_EXTRA[[:blank:]]*=/s/$/ -Wno-error=unused-parameter/
|
||||||
|
@ -40,7 +40,7 @@
|
|||||||
/* Work around for perl-5.18.
|
/* Work around for perl-5.18.
|
||||||
* Don't include "perl\lib\CORE\inline.h" for now,
|
* Don't include "perl\lib\CORE\inline.h" for now,
|
||||||
* include it after Perl_sv_free2 is defined. */
|
* include it after Perl_sv_free2 is defined. */
|
||||||
#ifdef DYNAMIC_PERL
|
#if (PERL_REVISION == 5) && (PERL_VERSION >= 18)
|
||||||
# define PERL_NO_INLINE_FUNCTIONS
|
# define PERL_NO_INLINE_FUNCTIONS
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -402,14 +402,14 @@ static bool (*Perl_sv_2bool)(pTHX_ SV*);
|
|||||||
static IV (*Perl_sv_2iv)(pTHX_ SV*);
|
static IV (*Perl_sv_2iv)(pTHX_ SV*);
|
||||||
static SV* (*Perl_sv_2mortal)(pTHX_ SV*);
|
static SV* (*Perl_sv_2mortal)(pTHX_ SV*);
|
||||||
# if (PERL_REVISION == 5) && (PERL_VERSION >= 8)
|
# 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*);
|
static char* (*Perl_sv_2pv_nolen)(pTHX_ SV*);
|
||||||
# else
|
# else
|
||||||
static char* (*Perl_sv_2pv)(pTHX_ SV*, STRLEN*);
|
static char* (*Perl_sv_2pv)(pTHX_ SV*, STRLEN*);
|
||||||
# endif
|
# endif
|
||||||
static char* (*Perl_sv_2pvbyte)(pTHX_ SV*, STRLEN*);
|
static char* (*Perl_sv_2pvbyte)(pTHX_ SV*, STRLEN*);
|
||||||
# if (PERL_REVISION == 5) && (PERL_VERSION >= 32)
|
# 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
|
# endif
|
||||||
static SV* (*Perl_sv_bless)(pTHX_ SV*, HV*);
|
static SV* (*Perl_sv_bless)(pTHX_ SV*, HV*);
|
||||||
# if (PERL_REVISION == 5) && (PERL_VERSION >= 8)
|
# if (PERL_REVISION == 5) && (PERL_VERSION >= 8)
|
||||||
@ -710,7 +710,7 @@ S_POPMARK(pTHX)
|
|||||||
# endif
|
# endif
|
||||||
|
|
||||||
/* perl-5.34 needs Perl_SvTRUE_common; used in SvTRUE_nomg_NN */
|
/* 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_STATIC_INLINE bool
|
||||||
Perl_SvTRUE_common(pTHX_ SV * sv, const bool sv_2bool_is_fallback)
|
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
|
# endif
|
||||||
|
|
||||||
/* perl-5.32 needs Perl_SvTRUE */
|
/* 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_STATIC_INLINE bool
|
||||||
Perl_SvTRUE(pTHX_ SV *sv) {
|
Perl_SvTRUE(pTHX_ SV *sv) {
|
||||||
if (!LIKELY(sv))
|
if (!LIKELY(sv))
|
||||||
@ -1649,7 +1649,7 @@ Buffers(...)
|
|||||||
PPCODE:
|
PPCODE:
|
||||||
if (items == 0)
|
if (items == 0)
|
||||||
{
|
{
|
||||||
if (GIMME == G_SCALAR)
|
if (GIMME_V == G_SCALAR)
|
||||||
{
|
{
|
||||||
i = 0;
|
i = 0;
|
||||||
FOR_ALL_BUFFERS(vimbuf)
|
FOR_ALL_BUFFERS(vimbuf)
|
||||||
@ -1700,7 +1700,7 @@ Windows(...)
|
|||||||
PPCODE:
|
PPCODE:
|
||||||
if (items == 0)
|
if (items == 0)
|
||||||
{
|
{
|
||||||
if (GIMME == G_SCALAR)
|
if (GIMME_V == G_SCALAR)
|
||||||
XPUSHs(sv_2mortal(newSViv(win_count())));
|
XPUSHs(sv_2mortal(newSViv(win_count())));
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -695,6 +695,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1681,
|
||||||
/**/
|
/**/
|
||||||
1680,
|
1680,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user