Return-Path: Delivered-To: apmail-perl-modperl-cvs-archive@www.apache.org Received: (qmail 36952 invoked from network); 30 Nov 2006 11:20:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 Nov 2006 11:20:58 -0000 Received: (qmail 33227 invoked by uid 500); 30 Nov 2006 11:21:07 -0000 Delivered-To: apmail-perl-modperl-cvs-archive@perl.apache.org Received: (qmail 33210 invoked by uid 500); 30 Nov 2006 11:21:07 -0000 Mailing-List: contact modperl-cvs-help@perl.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@perl.apache.org List-Id: Delivered-To: mailing list modperl-cvs@perl.apache.org Received: (qmail 33199 invoked by uid 99); 30 Nov 2006 11:21:07 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Nov 2006 03:21:07 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Nov 2006 03:20:58 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 842441A9846; Thu, 30 Nov 2006 03:20:19 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r480890 - in /perl/modperl/trunk: Changes src/modules/perl/mod_perl.c src/modules/perl/modperl_interp.h Date: Thu, 30 Nov 2006 11:20:17 -0000 To: modperl-cvs@perl.apache.org From: pgollucci@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061130112019.842441A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pgollucci Date: Thu Nov 30 03:20:13 2006 New Revision: 480890 URL: http://svn.apache.org/viewvc?view=rev&rev=480890 Log: o PERL_SYS_TERM() needs a PerlInterpreter 'my_perl' as of 5.9.5 o xmg_magic moved into a union as a space saver. (note, as stas noted previously this entire kludge needs to be fixed) Modified: perl/modperl/trunk/Changes perl/modperl/trunk/src/modules/perl/mod_perl.c perl/modperl/trunk/src/modules/perl/modperl_interp.h Modified: perl/modperl/trunk/Changes URL: http://svn.apache.org/viewvc/perl/modperl/trunk/Changes?view=diff&rev=480890&r1=480889&r2=480890 ============================================================================== --- perl/modperl/trunk/Changes (original) +++ perl/modperl/trunk/Changes Thu Nov 30 03:20:13 2006 @@ -12,6 +12,8 @@ =item 2.0.4-dev +Fixes to get bleed-ithread (5.9.5+) to comile again. + =item 2.0.3 November 28, 2006 Prevent things in %INC that are not stat() able Modified: perl/modperl/trunk/src/modules/perl/mod_perl.c URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/mod_perl.c?view=diff&rev=480890&r1=480889&r2=480890 ============================================================================== --- perl/modperl/trunk/src/modules/perl/mod_perl.c (original) +++ perl/modperl/trunk/src/modules/perl/mod_perl.c Thu Nov 30 03:20:13 2006 @@ -584,6 +584,15 @@ static apr_status_t modperl_sys_term(void *data) { + /* PERL_SYS_TERM() needs 'my_perl' as of 5.9.5 */ +#ifdef USE_ITHREADS +# if PERL_REVISION == 5 && \ + ((PERL_VERSION == 9 && PERL_SUBVERSION > 4) || \ + PERL_VERSION > 9) + modperl_cleanup_data_t *cdata = (modperl_cleanup_data_t *)data; + PerlInterpreter *my_perl = (PerlInterpreter *)cdata->data; +# endif +#endif MP_init_status = 0; MP_threads_started = 0; MP_post_post_config_phase = 0; Modified: perl/modperl/trunk/src/modules/perl/modperl_interp.h URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_interp.h?view=diff&rev=480890&r1=480889&r2=480890 ============================================================================== --- perl/modperl/trunk/src/modules/perl/modperl_interp.h (original) +++ perl/modperl/trunk/src/modules/perl/modperl_interp.h Thu Nov 30 03:20:13 2006 @@ -44,8 +44,15 @@ #endif #ifndef HvPMROOT +# if PERL_REVISION == 5 && \ + ((PERL_VERSION == 9 && PERL_SUBVERSION > 4) || \ + PERL_VERSION > 9) +#define MP_THX_INTERP_SET(thx, interp) \ + ((XPVMG*)SvANY(*Perl_Imodglobal_ptr(thx)))->xmg_u.xmg_magic = (MAGIC*)interp +# else #define MP_THX_INTERP_SET(thx, interp) \ ((XPVMG*)SvANY(*Perl_Imodglobal_ptr(thx)))->xmg_magic = (MAGIC*)interp +# endif #else #define MP_THX_INTERP_SET(thx, interp) \ HvPMROOT(*Perl_Imodglobal_ptr(thx)) = (PMOP*)interp