diff --git a/src/if_perl.xs b/src/if_perl.xs index 990a190f83..cdac145adb 100644 --- a/src/if_perl.xs +++ b/src/if_perl.xs @@ -52,6 +52,11 @@ # include #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 */ #ifndef PERLIO_FUNCS_DECL # ifdef PERLIO_FUNCS_CONST @@ -312,9 +317,6 @@ typedef int perl_key; # ifdef PERL_USE_THREAD_LOCAL # define PL_current_context *dll_PL_current_context # 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_iterinit dll_Perl_hv_iterinit # 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 static void** dll_PL_current_context; # 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 HE * (*Perl_hv_iternext_flags)(pTHX_ HV *, I32); static I32 (*Perl_hv_iterinit)(pTHX_ HV *); @@ -642,9 +641,6 @@ static struct { # ifdef PERL_USE_THREAD_LOCAL {"PL_current_context", (PERL_PROC*)&dll_PL_current_context}, # endif -# if defined(DYNAMIC_PERL) && ((PERL_REVISION == 5) && (PERL_VERSION >= 38)) - {"PL_memory_wrap", (PERL_PROC*)&dll_PL_memory_wrap}, -# endif # else {"Perl_Idefgv_ptr", (PERL_PROC*)&Perl_Idefgv_ptr}, {"Perl_Ierrgv_ptr", (PERL_PROC*)&Perl_Ierrgv_ptr}, diff --git a/src/version.c b/src/version.c index 123c106725..825cfb80ca 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1103, /**/ 1102, /**/