diff options
| author | jorton <jorton@13f79535-47bb-0310-9956-ffa450edef68> | 2005-05-04 13:03:23 +0000 |
|---|---|---|
| committer | jorton <jorton@13f79535-47bb-0310-9956-ffa450edef68> | 2005-05-04 13:03:23 +0000 |
| commit | ff13a962a64f5cd906f1ea79a08ac7f892659d00 (patch) | |
| tree | 654728af4e5a0d57b78bc6da269e8c5b243224c6 /tables/apr_hash.c | |
| parent | c11eefef596881475ff3be7778073b85e0861116 (diff) | |
| download | libapr-ff13a962a64f5cd906f1ea79a08ac7f892659d00.tar.gz | |
* tables/apr_hash.c (apr_hash_merge): Enable pool lifetime debugging.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@168121 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'tables/apr_hash.c')
| -rw-r--r-- | tables/apr_hash.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tables/apr_hash.c b/tables/apr_hash.c index 5cabe4faa..574d4161a 100644 --- a/tables/apr_hash.c +++ b/tables/apr_hash.c @@ -28,6 +28,9 @@ #include <string.h> #endif +#if APR_POOL_DEBUG && APR_HAVE_STDIO_H +#include <stdio.h> +#endif /* * The internal form of a hash table. @@ -387,19 +390,19 @@ APR_DECLARE(apr_hash_t *) apr_hash_merge(apr_pool_t *p, apr_hash_entry_t *ent; unsigned int i,j,k; -#ifdef POOL_DEBUG +#if APR_POOL_DEBUG /* we don't copy keys and values, so it's necessary that * overlay->a.pool and base->a.pool have a life span at least * as long as p */ if (!apr_pool_is_ancestor(overlay->pool, p)) { fprintf(stderr, - "apr_hash_overlay: overlay's pool is not an ancestor of p\n"); + "apr_hash_merge: overlay's pool is not an ancestor of p\n"); abort(); } if (!apr_pool_is_ancestor(base->pool, p)) { fprintf(stderr, - "apr_hash_overlay: base's pool is not an ancestor of p\n"); + "apr_hash_merge: base's pool is not an ancestor of p\n"); abort(); } #endif |