perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pgollu...@apache.org
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 GMT
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 <janus@errornet.de>
Submitted by: gozer, Simon Bertrang <janus@errornet.de>
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



Mime
View raw message