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

patch 9.1.1103: if_perl: still some compile errors with Perl 5.38

Browse Source 
Problem:  if_perl: still some compile errors with Perl 5.38
Solution: copy declaration of PL_memory_wrap from Perl header
          (Drew Vogel)

closes: #16613

Signed-off-by: Drew Vogel <dvogel@github>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Drew Vogel
2025-02-11 20:06:07 +01:00
committed by Christian Brabandt
parent bfc7719e48
commit 8cc725e927
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/if_perl.xs
View File

@@ -52,6 +52,11 @@
# include <perliol.h> # include <perliol.h>
#endif #endif
#if defined(DYNAMIC_PERL) && ((PERL_REVISION == 5) && (PERL_VERSION >= 38))
// Copy/pasted from perl.h
const char PL_memory_wrap[] = "panic: memory wrap";
#endif
/* Workaround for perl < 5.8.7 */ /* Workaround for perl < 5.8.7 */
#ifndef PERLIO_FUNCS_DECL #ifndef PERLIO_FUNCS_DECL
# ifdef PERLIO_FUNCS_CONST # ifdef PERLIO_FUNCS_CONST
@@ -312,9 +317,6 @@ typedef int perl_key;
# ifdef PERL_USE_THREAD_LOCAL # ifdef PERL_USE_THREAD_LOCAL
# define PL_current_context *dll_PL_current_context # define PL_current_context *dll_PL_current_context
# endif # endif
# if defined(DYNAMIC_PERL) && ((PERL_REVISION == 5) && (PERL_VERSION >= 38))
# define PL_memory_wrap *dll_PL_memory_wrap
# endif
# define Perl_hv_iternext_flags dll_Perl_hv_iternext_flags # define Perl_hv_iternext_flags dll_Perl_hv_iternext_flags
# define Perl_hv_iterinit dll_Perl_hv_iterinit # define Perl_hv_iterinit dll_Perl_hv_iterinit
# define Perl_hv_iterkey dll_Perl_hv_iterkey # define Perl_hv_iterkey dll_Perl_hv_iterkey
@@ -487,9 +489,6 @@ static perl_key* (*Perl_Gthr_key_ptr)_((pTHX));
# ifdef PERL_USE_THREAD_LOCAL # ifdef PERL_USE_THREAD_LOCAL
static void** dll_PL_current_context; static void** dll_PL_current_context;
# endif # endif
# if defined(DYNAMIC_PERL) && ((PERL_REVISION == 5) && (PERL_VERSION >= 38))
static const char **dll_PL_memory_wrap;
# endif
static void (*boot_DynaLoader)_((pTHX_ CV*)); static void (*boot_DynaLoader)_((pTHX_ CV*));
static HE * (*Perl_hv_iternext_flags)(pTHX_ HV *, I32); static HE * (*Perl_hv_iternext_flags)(pTHX_ HV *, I32);
static I32 (*Perl_hv_iterinit)(pTHX_ HV *); static I32 (*Perl_hv_iterinit)(pTHX_ HV *);
@@ -642,9 +641,6 @@ static struct {
# ifdef PERL_USE_THREAD_LOCAL # ifdef PERL_USE_THREAD_LOCAL
{"PL_current_context", (PERL_PROC*)&dll_PL_current_context}, {"PL_current_context", (PERL_PROC*)&dll_PL_current_context},
# endif # endif
# if defined(DYNAMIC_PERL) && ((PERL_REVISION == 5) && (PERL_VERSION >= 38))
{"PL_memory_wrap", (PERL_PROC*)&dll_PL_memory_wrap},
# endif
# else # else
{"Perl_Idefgv_ptr", (PERL_PROC*)&Perl_Idefgv_ptr}, {"Perl_Idefgv_ptr", (PERL_PROC*)&Perl_Idefgv_ptr},
{"Perl_Ierrgv_ptr", (PERL_PROC*)&Perl_Ierrgv_ptr}, {"Perl_Ierrgv_ptr", (PERL_PROC*)&Perl_Ierrgv_ptr},

2
src/version.c
View File

@@ -704,6 +704,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 */
/**/
1103,
/**/ /**/
1102, 1102,
/**/ /**/