projects
/
apache
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
adc3604
)
disable pool alloc poisoning if APR_POOL_DEBUG is enabled because it uses
author
Stefan Fritsch
<sf@apache.org>
Fri, 22 Mar 2013 21:13:10 +0000
(21:13 +0000)
committer
Stefan Fritsch
<sf@apache.org>
Fri, 22 Mar 2013 21:13:10 +0000
(21:13 +0000)
conflicting defines
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1459992
13f79535
-47bb-0310-9956-
ffa450edef68
include/httpd.h
patch
|
blob
|
history
diff --git
a/include/httpd.h
b/include/httpd.h
index 543f578b3bdf6deb8f531ba2109dd65c1da61d95..6ab82b0d3b2eefdf43c0a638bd39f5624cfbc7ef 100644
(file)
--- 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)
-#if
ndef AP_DEBUG_NO_ALLOC_POISON
+#if
!defined(AP_DEBUG_NO_ALLOC_POISON) && !APR_POOL_DEBUG
/*
* ap_palloc_debug initializes allocated memory to non-zero
*/