Return-Path: Delivered-To: apmail-perl-modperl-cvs-archive@www.apache.org Received: (qmail 66988 invoked from network); 8 May 2008 23:49:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 May 2008 23:49:40 -0000 Received: (qmail 62139 invoked by uid 500); 8 May 2008 23:49:42 -0000 Delivered-To: apmail-perl-modperl-cvs-archive@perl.apache.org Received: (qmail 62115 invoked by uid 500); 8 May 2008 23:49:42 -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 62104 invoked by uid 99); 8 May 2008 23:49:42 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 May 2008 16:49:42 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 May 2008 23:48:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4945C238899B; Thu, 8 May 2008 16:49:17 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r654655 - in /perl/modperl/trunk: Changes lib/ModPerl/BuildMM.pm src/modules/perl/modperl_apache_compat.h Date: Thu, 08 May 2008 23:49:16 -0000 To: modperl-cvs@perl.apache.org From: pgollucci@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080508234917.4945C238899B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pgollucci Date: Thu May 8 16:49:16 2008 New Revision: 654655 URL: http://svn.apache.org/viewvc?rev=654655&view=rev Log: Fix compiles with non-threaded APRs. Reported by: pgollucci, Simon Bertrang Submitted by: gozer, Simon Bertrang Reviewed by: pgollucci Modified: perl/modperl/trunk/Changes perl/modperl/trunk/lib/ModPerl/BuildMM.pm perl/modperl/trunk/src/modules/perl/modperl_apache_compat.h Modified: perl/modperl/trunk/Changes URL: http://svn.apache.org/viewvc/perl/modperl/trunk/Changes?rev=654655&r1=654654&r2=654655&view=diff ============================================================================== --- perl/modperl/trunk/Changes (original) +++ perl/modperl/trunk/Changes Thu May 8 16:49:16 2008 @@ -12,6 +12,9 @@ =item 2.0.5-dev +Fix compilation when using a non-threaded APR. +[Gozer, Philip M. Gollucci] + Make sure mod_perl's own ChildInitHandlers are run before user supplied ones. This fixes the incorrectly reported value of $$ at ChildInit time [Gozer] Modified: perl/modperl/trunk/lib/ModPerl/BuildMM.pm URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/ModPerl/BuildMM.pm?rev=654655&r1=654654&r2=654655&view=diff ============================================================================== --- perl/modperl/trunk/lib/ModPerl/BuildMM.pm (original) +++ perl/modperl/trunk/lib/ModPerl/BuildMM.pm Thu May 8 16:49:16 2008 @@ -359,7 +359,7 @@ $apr_config ||= $build->get_apr_config(); - if ($path =~ m/(Thread|Global)Mutex/) { + if ($path =~ m/(Thread|Global)(Mutex|RWLock)/) { return unless $apr_config->{HAS_THREADS}; } Modified: perl/modperl/trunk/src/modules/perl/modperl_apache_compat.h URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_apache_compat.h?rev=654655&r1=654654&r2=654655&view=diff ============================================================================== --- perl/modperl/trunk/src/modules/perl/modperl_apache_compat.h (original) +++ perl/modperl/trunk/src/modules/perl/modperl_apache_compat.h Thu May 8 16:49:16 2008 @@ -22,6 +22,7 @@ #if !APR_HAS_THREADS typedef unsigned long apr_os_thread_t; typedef void * apr_thread_mutex_t; +typedef void * apr_thread_rwlock_t; #endif /* back compat adjustements for older Apache versions