svn commit: r1344224 - in /perl/modperl/trunk: Changes src/modules/perl/modperl_perl.c

[stevehay]

Author: stevehay
Date: Wed May 30 12:24:43 2012
New Revision: 1344224

URL: http://svn.apache.org/viewvc?rev=1344224&view=rev
Log:
Apply patch from rt.cpan.org #77129 to fix breakage caused by removal of PL_uid 
et al from perl 5.16.0.

Modified:
    perl/modperl/trunk/Changes
    perl/modperl/trunk/src/modules/perl/modperl_perl.c

Modified: perl/modperl/trunk/Changes
URL: 
http://svn.apache.org/viewvc/perl/modperl/trunk/Changes?rev=1344224&r1=1344223&r2=1344224&view=diff
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Wed May 30 12:24:43 2012
@@ -12,6 +12,9 @@ Also refer to the Apache::Test changes l
 
 =item 2.0.7-dev
 
+Fix breakage caused by removal of PL_uid et al from perl 5.16.0. Patch from
+rt.cpan.org #77129. [Zefram]
+
 =item 2.0.6 April 24, 2012
 
 Preserve 5.8 compatibility surrounding use of MUTABLE_CV [Adam Prime]

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=1344224&r1=1344223&r2=1344224&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_perl.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_perl.c Wed May 30 12:24:43 2012
@@ -101,6 +101,7 @@ static void modperl_perl_init_ids(pTHX_ 
 {
     sv_setiv(GvSV(gv_fetchpv("$", TRUE, SVt_PV)), ids->pid);
 
+#if !MP_PERL_VERSION_AT_LEAST(5, 16, 0)
 #ifndef WIN32
     PL_uid  = ids->uid;
     PL_euid = ids->euid;
@@ -110,6 +111,7 @@ static void modperl_perl_init_ids(pTHX_ 
 #ifdef MP_MAINTAIN_PPID
     PL_ppid = ids->ppid;
 #endif
+#endif
 }