From: Martin Kraemer <martin@apache.org>
Date: Tue, 30 Sep 2003 15:22:41 +0000 (+0000)
Subject: Match type of both arguments (get rid of compiler warning) in x ? y : z expression
X-Git-Tag: pre_ajp_proxy~1128
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=18a48592cad6d070325356743079f519a93b0cf8;p=apache

Match type of both arguments (get rid of compiler warning) in x ? y : z expression


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101357 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index e62e22c559..5ccee38c5b 100644
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -2049,7 +2049,7 @@ static char *do_expand(char *input, rewrite_ctx *ctx)
         if (current->len) {
             current->next = (spc < SMALL_EXPANSION)
                             ? &(sresult[spc++])
-                            : apr_palloc(pool, sizeof(result_list));
+                            : (result_list *)apr_palloc(pool, sizeof(result_list));
             current = current->next;
             current->next = NULL;
             current->len = 0;
@@ -2176,7 +2176,7 @@ static char *do_expand(char *input, rewrite_ctx *ctx)
             if (current->len) {
                 current->next = (spc < SMALL_EXPANSION)
                                 ? &(sresult[spc++])
-                                : apr_palloc(pool, sizeof(result_list));
+                                : (result_list *)apr_palloc(pool, sizeof(result_list));
                 current = current->next;
                 current->next = NULL;
             }