Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r931794 - /httpd/httpd/trunk/server/core.c
Date: Thu, 08 Apr 2010 06:45:34 -0000
To: cvs@httpd.apache.org
From: rpluem@apache.org
Message-Id: <20100408064534.526DA23888FE@eris.apache.org>

Author: rpluem
Date: Thu Apr  8 06:45:34 2010
New Revision: 931794

URL: http://svn.apache.org/viewvc?rev=931794&view=rev
Log:
* Fix compiler warning on 64 bit systems (cast from pointer to integer of different size)

Modified:
    httpd/httpd/trunk/server/core.c

Modified: httpd/httpd/trunk/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?rev=931794&r1=931793&r2=931794&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core.c (original)
+++ httpd/httpd/trunk/server/core.c Thu Apr  8 06:45:34 2010
@@ -2572,7 +2572,7 @@ static const char *include_config (cmd_p
     ap_directive_t *conftree = NULL;
     const char *conffile, *error;
     unsigned *recursion;
-    int optional = (int)cmd->cmd->cmd_data;
+    int optional = cmd->cmd->cmd_data ? 1 : 0;
     void *data;
 
     apr_pool_userdata_get(&data, "ap_include_sentinel", cmd->pool);