aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

patch 7.4.1848

Browse Source 
Problem:    Can't build with Strawberry Perl 5.24.
Solution:   Define S_SvREFCNT_dec() if needed. (Damien, Ken Takata)
This commit is contained in:
Bram Moolenaar
2016-05-26 22:10:00 +02:00
parent 13ddc5c359
commit 6727bf8617
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/if_perl.xs
View File

@@ -299,6 +299,9 @@ typedef int perl_key;
# define PerlIOBase_pushed dll_PerlIOBase_pushed # define PerlIOBase_pushed dll_PerlIOBase_pushed
# define PerlIO_define_layer dll_PerlIO_define_layer # define PerlIO_define_layer dll_PerlIO_define_layer
# endif # endif
# if (PERL_REVISION == 5) && (PERL_VERSION >= 24)
# define Perl_savetmps dll_Perl_savetmps
# endif
/* /*
* Declare HANDLE for perl.dll and function pointers. * Declare HANDLE for perl.dll and function pointers.
@@ -455,6 +458,9 @@ static NV (*Perl_sv_2nv_flags)(pTHX_ SV *const, const I32);
static IV (*PerlIOBase_pushed)(pTHX_ PerlIO *, const char *, SV *, PerlIO_funcs *); static IV (*PerlIOBase_pushed)(pTHX_ PerlIO *, const char *, SV *, PerlIO_funcs *);
static void (*PerlIO_define_layer)(pTHX_ PerlIO_funcs *); static void (*PerlIO_define_layer)(pTHX_ PerlIO_funcs *);
#endif #endif
#if (PERL_REVISION == 5) && (PERL_VERSION >= 24)
static void (*Perl_savetmps)(pTHX);
#endif
/* /*
* Table of name to function pointer of perl. * Table of name to function pointer of perl.
@@ -597,18 +603,28 @@ static struct {
#if defined(PERLIO_LAYERS) && !defined(USE_SFIO) #if defined(PERLIO_LAYERS) && !defined(USE_SFIO)
{"PerlIOBase_pushed", (PERL_PROC*)&PerlIOBase_pushed}, {"PerlIOBase_pushed", (PERL_PROC*)&PerlIOBase_pushed},
{"PerlIO_define_layer", (PERL_PROC*)&PerlIO_define_layer}, {"PerlIO_define_layer", (PERL_PROC*)&PerlIO_define_layer},
#endif
#if (PERL_REVISION == 5) && (PERL_VERSION >= 24)
{"Perl_savetmps", (PERL_PROC*)&Perl_savetmps},
#endif #endif
{"", NULL}, {"", NULL},
}; };
/* Work around for perl-5.18. /* Work around for perl-5.18.
* The definitions of S_SvREFCNT_inc and S_SvREFCNT_dec are needed, so include * For now, only the definitions of S_SvREFCNT_dec are needed in
* "perl\lib\CORE\inline.h", after Perl_sv_free2 is defined. * "perl\lib\CORE\inline.h". */
* The linker won't complain about undefined __impl_Perl_sv_free2. */
#if (PERL_REVISION == 5) && (PERL_VERSION >= 18) #if (PERL_REVISION == 5) && (PERL_VERSION >= 18)
# define PL_memory_wrap "panic: memory wrap" /* Dummy */ static void
# include <inline.h> S_SvREFCNT_dec(pTHX_ SV *sv)
# undef PL_memory_wrap {
if (LIKELY(sv != NULL)) {
U32 rc = SvREFCNT(sv);
if (LIKELY(rc > 1))
SvREFCNT(sv) = rc - 1;
else
Perl_sv_free2(aTHX_ sv, rc);
}
}
#endif #endif
/* /*
@@ -777,7 +793,7 @@ newWINrv(SV *rv, win_T *ptr)
sv_setiv(ptr->w_perl_private, PTR2IV(ptr)); sv_setiv(ptr->w_perl_private, PTR2IV(ptr));
} }
else else
SvREFCNT_inc(ptr->w_perl_private); SvREFCNT_inc_void_NN(ptr->w_perl_private);
SvRV(rv) = ptr->w_perl_private; SvRV(rv) = ptr->w_perl_private;
SvROK_on(rv); SvROK_on(rv);
return sv_bless(rv, gv_stashpv("VIWIN", TRUE)); return sv_bless(rv, gv_stashpv("VIWIN", TRUE));
@@ -793,7 +809,7 @@ newBUFrv(SV *rv, buf_T *ptr)
sv_setiv(ptr->b_perl_private, PTR2IV(ptr)); sv_setiv(ptr->b_perl_private, PTR2IV(ptr));
} }
else else
SvREFCNT_inc(ptr->b_perl_private); SvREFCNT_inc_void_NN(ptr->b_perl_private);
SvRV(rv) = ptr->b_perl_private; SvRV(rv) = ptr->b_perl_private;
SvROK_on(rv); SvROK_on(rv);
return sv_bless(rv, gv_stashpv("VIBUF", TRUE)); return sv_bless(rv, gv_stashpv("VIBUF", TRUE));

2
src/version.c
View File

@@ -753,6 +753,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 */
/**/
1848,
/**/ /**/
1847, 1847,
/**/ /**/