You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by rj...@apache.org on 2013/10/03 16:25:01 UTC
svn commit: r1528885 - in /apr/apr/branches/1.5.x: ./ tables/apr_tables.c
Author: rjung
Date: Thu Oct 3 14:25:00 2013
New Revision: 1528885
URL: http://svn.apache.org/r1528885
Log:
fix warning: comparison of distinct pointer types lacks a cast
Backport of r1459994 from trunk.
Modified:
apr/apr/branches/1.5.x/ (props changed)
apr/apr/branches/1.5.x/tables/apr_tables.c
Propchange: apr/apr/branches/1.5.x/
------------------------------------------------------------------------------
Merged /apr/apr/trunk:r1459994
Modified: apr/apr/branches/1.5.x/tables/apr_tables.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/tables/apr_tables.c?rev=1528885&r1=1528884&r2=1528885&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/tables/apr_tables.c (original)
+++ apr/apr/branches/1.5.x/tables/apr_tables.c Thu Oct 3 14:25:00 2013
@@ -744,12 +744,14 @@ APR_DECLARE(void) apr_table_mergen(apr_t
{
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();
}