From 5200c0e793411e9a124f4bcc231d00fa1d6aa657 Mon Sep 17 00:00:00 2001 From: Stefan Fritsch Date: Fri, 22 Mar 2013 21:13:10 +0000 Subject: [PATCH] disable pool alloc poisoning if APR_POOL_DEBUG is enabled because it uses conflicting defines git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1459992 13f79535-47bb-0310-9956-ffa450edef68 --- include/httpd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/httpd.h b/include/httpd.h index 543f578b3bd..6ab82b0d3b2 100644 --- a/include/httpd.h +++ b/include/httpd.h @@ -2153,7 +2153,7 @@ AP_DECLARE(void *) ap_pcalloc_debug(apr_pool_t *p, apr_size_t size); #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 */ -- 2.47.3