Return-Path: Delivered-To: apmail-perl-modperl-cvs-archive@www.apache.org Received: (qmail 36396 invoked from network); 15 Dec 2005 18:26:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 15 Dec 2005 18:26:40 -0000 Received: (qmail 71710 invoked by uid 500); 15 Dec 2005 18:26:40 -0000 Delivered-To: apmail-perl-modperl-cvs-archive@perl.apache.org Received: (qmail 71685 invoked by uid 500); 15 Dec 2005 18:26:40 -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 71674 invoked by uid 99); 15 Dec 2005 18:26:39 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Dec 2005 10:26:39 -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 [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 15 Dec 2005 10:26:39 -0800 Received: (qmail 36318 invoked by uid 65534); 15 Dec 2005 18:26:17 -0000 Message-ID: <20051215182617.36317.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r357052 - in /perl/modperl/trunk: Changes lib/Apache2/Build.pm Date: Thu, 15 Dec 2005 18:26:16 -0000 To: modperl-cvs@perl.apache.org From: geoff@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: geoff Date: Thu Dec 15 10:26:11 2005 New Revision: 357052 URL: http://svn.apache.org/viewcvs?rev=357052&view=rev Log: remove -DAP_HAVE_DESIGNATED_INITIALIZER and -DAP_DEBUG from MP_MAINTAINER mode to avoid collisions Modified: perl/modperl/trunk/Changes perl/modperl/trunk/lib/Apache2/Build.pm Modified: perl/modperl/trunk/Changes URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=357052&r1=357051&r2=357052&view=diff ============================================================================== --- perl/modperl/trunk/Changes (original) +++ perl/modperl/trunk/Changes Thu Dec 15 10:26:11 2005 @@ -12,6 +12,9 @@ =item 2.0.3-dev +remove -DAP_HAVE_DESIGNATED_INITIALIZER and -DAP_DEBUG from +MP_MAINTAINER mode to avoid collisions [Joe Orton] + Back out r280262 which was causing Apache2::Reload to misbehave. [JT Smith ] Modified: perl/modperl/trunk/lib/Apache2/Build.pm URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Build.pm?rev=357052&r1=357051&r2=357052&view=diff ============================================================================== --- perl/modperl/trunk/lib/Apache2/Build.pm (original) +++ perl/modperl/trunk/lib/Apache2/Build.pm Thu Dec 15 10:26:11 2005 @@ -524,8 +524,7 @@ $self->{MP_DEBUG} = 1; if ($self->perl_config('gccversion')) { #same as --with-maintainter-mode - $ccopts .= " $Wall -DAP_DEBUG"; - $ccopts .= " -DAP_HAVE_DESIGNATED_INITIALIZER"; + $ccopts .= " $Wall"; } if ($self->has_gcc_version('3.3.2') &&