diff options
| author | rjung <rjung@13f79535-47bb-0310-9956-ffa450edef68> | 2013-10-03 14:25:00 +0000 |
|---|---|---|
| committer | rjung <rjung@13f79535-47bb-0310-9956-ffa450edef68> | 2013-10-03 14:25:00 +0000 |
| commit | 4c6ad205ea9898eba7b55ea968abc1f12187a54c (patch) | |
| tree | 69f8224543bc1b4c706e6fe58f738110c5e36c3d /tables | |
| parent | 4e02e3f022311706d5e73e61b0e855af10051372 (diff) | |
| download | libapr-4c6ad205ea9898eba7b55ea968abc1f12187a54c.tar.gz | |
fix warning: comparison of distinct pointer types lacks a cast
Backport of r1459994 from trunk.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@1528885 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'tables')
| -rw-r--r-- | tables/apr_tables.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tables/apr_tables.c b/tables/apr_tables.c index 7c82583e3..2f5b4e537 100644 --- a/tables/apr_tables.c +++ b/tables/apr_tables.c @@ -744,12 +744,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(); } |