Return-Path: Delivered-To: apmail-perl-modperl-cvs-archive@www.apache.org Received: (qmail 88307 invoked from network); 3 Oct 2004 04:02:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 3 Oct 2004 04:02:51 -0000 Received: (qmail 31227 invoked by uid 500); 3 Oct 2004 04:02:51 -0000 Delivered-To: apmail-perl-modperl-cvs-archive@perl.apache.org Received: (qmail 31200 invoked by uid 500); 3 Oct 2004 04:02:50 -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 Delivered-To: mailing list modperl-cvs@perl.apache.org Received: (qmail 31186 invoked by uid 500); 3 Oct 2004 04:02:50 -0000 Delivered-To: apmail-modperl-2.0-cvs@apache.org X-ASF-Spam-Status: No, hits=-9.9 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,UPPERCASE_25_50 X-Spam-Check-By: apache.org Date: 3 Oct 2004 04:02:48 -0000 Message-ID: <20041003040248.88265.qmail@minotaur.apache.org> From: stas@apache.org To: modperl-2.0-cvs@apache.org Subject: cvs commit: modperl-2.0/src/modules/perl modperl_apr_compat.h X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N stas 2004/10/02 21:02:48 Modified: lib/ModPerl Code.pm src/modules/perl modperl_apr_compat.h Log: apr coming with 2.0.49 didn't have `APR_USETID', `APR_GSETID' and `APR_WSTICKY' defined Revision Changes Path 1.128 +3 -1 modperl-2.0/lib/ModPerl/Code.pm Index: Code.pm =================================================================== RCS file: /home/cvs/modperl-2.0/lib/ModPerl/Code.pm,v retrieving revision 1.127 retrieving revision 1.128 diff -u -u -r1.127 -r1.128 --- Code.pm 22 Sep 2004 01:29:31 -0000 1.127 +++ Code.pm 3 Oct 2004 04:02:48 -0000 1.128 @@ -806,7 +806,9 @@ my %ifdef = map { $_, 1 } qw(APLOG_TOCLIENT APR_LIMIT_NOFILE), # added in ??? qw(AP_MPMQ_STARTING AP_MPMQ_RUNNING AP_MPMQ_STOPPING - AP_MPMQ_MPM_STATE); # added in 2.0.49 + AP_MPMQ_MPM_STATE), # added in 2.0.49 + qw(APR_FILEPROT_USETID APR_FILEPROT_GSETID + APR_FILEPROT_WSTICKY); # added in 2.0.50? sub constants_ifdef { my $name = shift; 1.2 +3 -3 modperl-2.0/src/modules/perl/modperl_apr_compat.h Index: modperl_apr_compat.h =================================================================== RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_apr_compat.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -u -r1.1 -r1.2 --- modperl_apr_compat.h 22 Sep 2004 01:29:31 -0000 1.1 +++ modperl_apr_compat.h 3 Oct 2004 04:02:48 -0000 1.2 @@ -61,7 +61,7 @@ /* apr file permissions group rename (has no enum) */ -#ifndef APR_FILEPROT_USETID +#if defined(APR_USETID) && !defined(APR_FILEPROT_USETID) #define APR_FILEPROT_USETID APR_USETID #endif #ifndef APR_FILEPROT_UREAD @@ -73,7 +73,7 @@ #ifndef APR_FILEPROT_UEXECUTE #define APR_FILEPROT_UEXECUTE APR_UEXECUTE #endif -#ifndef APR_FILEPROT_GSETID +#if defined(APR_GSETID) && !defined(APR_FILEPROT_GSETID) #define APR_FILEPROT_GSETID APR_GSETID #endif #ifndef APR_FILEPROT_GREAD @@ -85,7 +85,7 @@ #ifndef APR_FILEPROT_GEXECUTE #define APR_FILEPROT_GEXECUTE APR_GEXECUTE #endif -#ifndef APR_FILEPROT_WSTICKY +#if defined(APR_WSTICKY) && !defined(APR_FILEPROT_WSTICKY) #define APR_FILEPROT_WSTICKY APR_WSTICKY #endif #ifndef APR_FILEPROT_WREAD