Author: torsten
Date: Sun Jan 23 15:02:19 2011
New Revision: 1062443
URL: http://svn.apache.org/viewvc?rev=1062443&view=rev
Log:
With Perl 5.13.x using GvGP and GvSV as an lvalue has become invalid.
See https://rt.cpan.org/Ticket/Display.html?id=64999
Modified:
perl/modperl/trunk/src/modules/perl/modperl_const.c
perl/modperl/trunk/src/modules/perl/modperl_perl.c
perl/modperl/trunk/src/modules/perl/modperl_perl.h
Modified: perl/modperl/trunk/src/modules/perl/modperl_const.c
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_const.c?rev=1062443&r1=1062442&r2=1062443&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_const.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_const.c Sun Jan 23 15:02:19 2011
@@ -51,7 +51,7 @@ static void new_constsub(pTHX_ constants
gv_init(alias, caller_stash, name, name_len, TRUE);
}
- GvCV(alias) = GvCV(*gvp);
+ GvCV_set(alias, GvCV(*gvp));
}
}
Modified: perl/modperl/trunk/src/modules/perl/modperl_perl.c
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_perl.c?rev=1062443&r1=1062442&r2=1062443&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_perl.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_perl.c Sun Jan 23 15:02:19 2011
@@ -55,7 +55,7 @@ void modperl_perl_core_global_init(pTHX)
while (cglobals->name) {
GV *gv = gv_fetchpv(cglobals->core_name, TRUE, SVt_PVCV);
- GvCV(gv) = get_cv(cglobals->sub_name, TRUE);
+ GvCV_set(gv, get_cv(cglobals->sub_name, TRUE));
GvIMPORTED_CV_on(gv);
cglobals++;
}
Modified: perl/modperl/trunk/src/modules/perl/modperl_perl.h
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_perl.h?rev=1062443&r1=1062442&r2=1062443&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_perl.h (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_perl.h Sun Jan 23 15:02:19 2011
@@ -47,4 +47,11 @@ void modperl_hash_seed_init(apr_pool_t *
void modperl_hash_seed_set(pTHX);
+#ifndef GvCV_set
+# define GvCV_set(gv, cv) (GvCV(gv)=(cv))
+#endif
+#ifndef GvGP_set
+# define GvGP_set(gv, gp) (GvGP(gv)=(gp))
+#endif
+
#endif /* MODPERL_PERL_H */
