Skip to content

Commit c4b0914

Browse files
author
Steve Hay
committed
Restore build with perl 5.8.8
MGf_LOCAL was introduced by perl commit a5063e7cd8fef802efd25ffe9df2c3748f4254f6 in 5.9.3 and back-ported to 5.8.9. Based on a patch from https://stackoverflow.com/a/49521058/11510760 git-svn-id: https://svn.apache.org/repos/asf/perl/modperl/trunk@1868115 13f79535-47bb-0310-9956-ffa450edef68
1 parent ef14c35 commit c4b0914

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

src/modules/perl/modperl_env.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,10 @@ static int modperl_env_magic_local_all(pTHX_ SV *nsv, MAGIC *mg)
541541
nmg = sv_magicext(nsv, mg->mg_obj, mg->mg_type, &MP_vtbl_env, (char*)NULL, 0);
542542
nmg->mg_ptr = mg->mg_ptr;
543543
nmg->mg_flags |= MGf_COPY;
544+
#if (PERL_REVISION == 5 && PERL_VERSION == 8 && PERL_SUBVERSION > 8) || \
545+
MP_PERL_VERSION_AT_LEAST(5, 9, 3)
544546
nmg->mg_flags |= MGf_LOCAL;
547+
#endif
545548

546549
return 1;
547550
}
@@ -679,7 +682,10 @@ void modperl_env_init(pTHX)
679682
/* Add our version instead */
680683
mg = sv_magicext((SV*)ENVHV, (SV*)NULL, PERL_MAGIC_env, &MP_vtbl_env, (char*)NULL, 0);
681684
mg->mg_flags |= MGf_COPY;
685+
#if (PERL_REVISION == 5 && PERL_VERSION == 8 && PERL_SUBVERSION > 8) || \
686+
MP_PERL_VERSION_AT_LEAST(5, 9, 3)
682687
mg->mg_flags |= MGf_LOCAL;
688+
#endif
683689
}
684690

685691
void modperl_env_unload(pTHX)

0 commit comments

Comments
 (0)