From 4cd40e6c8c03356cbe5eab8e111845364990c97b Mon Sep 17 00:00:00 2001
From: rpluem <rpluem@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 3 Aug 2012 07:49:54 +0000
Subject: Merge r1368819 from trunk:

* We only need the pool variable in the debug case.

Submitted by: rpluem


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.4.x@1368821 13f79535-47bb-0310-9956-ffa450edef68
---
 tables/apr_tables.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tables/apr_tables.c b/tables/apr_tables.c
index 683f48a16..7479ef47c 100644
--- a/tables/apr_tables.c
+++ b/tables/apr_tables.c
@@ -730,11 +730,11 @@ APR_DECLARE(void) apr_table_mergen(apr_table_t *t, const char *key,
     apr_table_entry_t *next_elt;
     apr_table_entry_t *end_elt;
     apr_uint32_t checksum;
-    apr_pool_t *pool;
     int hash;
 
 #if APR_POOL_DEBUG
     {
+	apr_pool_t *pool;
 	pool = apr_pool_find(key);
 	if ((pool != key) && (!apr_pool_is_ancestor(pool, t->a.pool))) {
 	    fprintf(stderr, "apr_table_mergen: key not in ancestor pool of t\n");
-- 
cgit v1.2.1