summaryrefslogtreecommitdiff
path: root/tables
diff options
context:
space:
mode:
authorStefan Fritsch <sf@apache.org>2013-03-22 21:19:18 +0000
committerStefan Fritsch <sf@apache.org>2013-03-22 21:19:18 +0000
commit2ebfbecf3ac7a147467bf428bee6531cf8538330 (patch)
tree828f0e740a3c6dd7f32b085b21c11312379e975a /tables
parentb48816da75c293a72bc9a3811b56f084eaf6f855 (diff)
downloadapr-2ebfbecf3ac7a147467bf428bee6531cf8538330.tar.gz
fix warning: comparison of distinct pointer types lacks a cast
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1459994 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'tables')
-rw-r--r--tables/apr_tables.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/tables/apr_tables.c b/tables/apr_tables.c
index 7479ef47c..c80ad30b5 100644
--- a/tables/apr_tables.c
+++ b/tables/apr_tables.c
@@ -736,12 +736,14 @@ APR_DECLARE(void) apr_table_mergen(apr_table_t *t, const char *key,
{
apr_pool_t *pool;
pool = apr_pool_find(key);
- if ((pool != key) && (!apr_pool_is_ancestor(pool, t->a.pool))) {
+ if ((pool != (apr_pool_t *)key)
+ && (!apr_pool_is_ancestor(pool, t->a.pool))) {
fprintf(stderr, "apr_table_mergen: key not in ancestor pool of t\n");
abort();
}
pool = apr_pool_find(val);
- if ((pool != val) && (!apr_pool_is_ancestor(pool, t->a.pool))) {
+ if ((pool != (apr_pool_t *)val)
+ && (!apr_pool_is_ancestor(pool, t->a.pool))) {
fprintf(stderr, "apr_table_mergen: val not in ancestor pool of t\n");
abort();
}