Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6D4CEF24F for ; Fri, 22 Mar 2013 21:13:32 +0000 (UTC) Received: (qmail 21287 invoked by uid 500); 22 Mar 2013 21:13:32 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 21240 invoked by uid 500); 22 Mar 2013 21:13:32 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 21229 invoked by uid 99); 22 Mar 2013 21:13:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Mar 2013 21:13:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Fri, 22 Mar 2013 21:13:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 434B323888EA; Fri, 22 Mar 2013 21:13:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1459992 - /httpd/httpd/trunk/include/httpd.h Date: Fri, 22 Mar 2013 21:13:11 -0000 To: cvs@httpd.apache.org From: sf@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130322211311.434B323888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sf Date: Fri Mar 22 21:13:10 2013 New Revision: 1459992 URL: http://svn.apache.org/r1459992 Log: disable pool alloc poisoning if APR_POOL_DEBUG is enabled because it uses conflicting defines Modified: httpd/httpd/trunk/include/httpd.h Modified: httpd/httpd/trunk/include/httpd.h URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/httpd.h?rev=1459992&r1=1459991&r2=1459992&view=diff ============================================================================== --- httpd/httpd/trunk/include/httpd.h (original) +++ httpd/httpd/trunk/include/httpd.h Fri Mar 22 21:13:10 2013 @@ -2153,7 +2153,7 @@ AP_DECLARE(void *) ap_pcalloc_debug(apr_ #undef strstr # define strstr(s, c) ap_strstr(s,c) -#ifndef AP_DEBUG_NO_ALLOC_POISON +#if !defined(AP_DEBUG_NO_ALLOC_POISON) && !APR_POOL_DEBUG /* * ap_palloc_debug initializes allocated memory to non-zero */