Return-Path: X-Original-To: apmail-apr-commits-archive@www.apache.org Delivered-To: apmail-apr-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C86FDF298 for ; Fri, 22 Mar 2013 21:19:42 +0000 (UTC) Received: (qmail 42707 invoked by uid 500); 22 Mar 2013 21:19:42 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 42612 invoked by uid 500); 22 Mar 2013 21:19:42 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 42600 invoked by uid 99); 22 Mar 2013 21:19:42 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Mar 2013 21:19:42 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Mar 2013 21:19:39 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DD36123888EA; Fri, 22 Mar 2013 21:19:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1459994 - /apr/apr/trunk/tables/apr_tables.c Date: Fri, 22 Mar 2013 21:19:18 -0000 To: commits@apr.apache.org From: sf@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130322211918.DD36123888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sf Date: Fri Mar 22 21:19:18 2013 New Revision: 1459994 URL: http://svn.apache.org/r1459994 Log: fix warning: comparison of distinct pointer types lacks a cast Modified: apr/apr/trunk/tables/apr_tables.c Modified: apr/apr/trunk/tables/apr_tables.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/tables/apr_tables.c?rev=1459994&r1=1459993&r2=1459994&view=diff ============================================================================== --- apr/apr/trunk/tables/apr_tables.c (original) +++ apr/apr/trunk/tables/apr_tables.c Fri Mar 22 21:19:18 2013 @@ -736,12 +736,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(); }