Skip to content

Commit 8cc725e

Browse files
Drew Vogelchrisbra
authored andcommitted
patch 9.1.1103: if_perl: still some compile errors with Perl 5.38
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 <[email protected]>
1 parent bfc7719 commit 8cc725e

2 files changed

Lines changed: 7 additions & 9 deletions

File tree

src/if_perl.xs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@
5252
# include <perliol.h>
5353
#endif
5454

55+
#if defined(DYNAMIC_PERL) && ((PERL_REVISION == 5) && (PERL_VERSION >= 38))
56+
// Copy/pasted from perl.h
57+
const char PL_memory_wrap[] = "panic: memory wrap";
58+
#endif
59+
5560
/* Workaround for perl < 5.8.7 */
5661
#ifndef PERLIO_FUNCS_DECL
5762
# ifdef PERLIO_FUNCS_CONST
@@ -312,9 +317,6 @@ typedef int perl_key;
312317
# ifdef PERL_USE_THREAD_LOCAL
313318
# define PL_current_context *dll_PL_current_context
314319
# endif
315-
# if defined(DYNAMIC_PERL) && ((PERL_REVISION == 5) && (PERL_VERSION >= 38))
316-
# define PL_memory_wrap *dll_PL_memory_wrap
317-
# endif
318320
# define Perl_hv_iternext_flags dll_Perl_hv_iternext_flags
319321
# define Perl_hv_iterinit dll_Perl_hv_iterinit
320322
# define Perl_hv_iterkey dll_Perl_hv_iterkey
@@ -487,9 +489,6 @@ static perl_key* (*Perl_Gthr_key_ptr)_((pTHX));
487489
# ifdef PERL_USE_THREAD_LOCAL
488490
static void** dll_PL_current_context;
489491
# endif
490-
# if defined(DYNAMIC_PERL) && ((PERL_REVISION == 5) && (PERL_VERSION >= 38))
491-
static const char **dll_PL_memory_wrap;
492-
# endif
493492
static void (*boot_DynaLoader)_((pTHX_ CV*));
494493
static HE * (*Perl_hv_iternext_flags)(pTHX_ HV *, I32);
495494
static I32 (*Perl_hv_iterinit)(pTHX_ HV *);
@@ -642,9 +641,6 @@ static struct {
642641
# ifdef PERL_USE_THREAD_LOCAL
643642
{"PL_current_context", (PERL_PROC*)&dll_PL_current_context},
644643
# endif
645-
# if defined(DYNAMIC_PERL) && ((PERL_REVISION == 5) && (PERL_VERSION >= 38))
646-
{"PL_memory_wrap", (PERL_PROC*)&dll_PL_memory_wrap},
647-
# endif
648644
# else
649645
{"Perl_Idefgv_ptr", (PERL_PROC*)&Perl_Idefgv_ptr},
650646
{"Perl_Ierrgv_ptr", (PERL_PROC*)&Perl_Ierrgv_ptr},

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,8 @@ static char *(features[]) =
704704

705705
static int included_patches[] =
706706
{ /* Add new patch number below this line */
707+
/**/
708+
1103,
707709
/**/
708710
1102,
709711
/**/

0 commit comments

Comments
 (0)