From: Stefan Fritsch <sf@apache.org>
Date: Tue, 13 Dec 2011 05:55:11 +0000 (+0000)
Subject: Merge r1213567:
X-Git-Tag: 2.3.16~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6632c1fb75ceb1186408384e57a39b8e0216b405;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1213567:
Explicitly cast function pointer, to remove 'const'.
Hopefully this makes the NetWare compiler happy.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1213570 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/util_expr_eval.c b/server/util_expr_eval.c
index abf3bdb4720..3f0460c9114 100644
--- a/server/util_expr_eval.c
+++ b/server/util_expr_eval.c
@@ -89,7 +89,8 @@ static const char *ap_expr_eval_word(ap_expr_eval_ctx_t *ctx,
         result = node->node_arg1;
         break;
     case op_Var:
-        result = ap_expr_eval_var(ctx, node->node_arg1, node->node_arg2);
+        result = ap_expr_eval_var(ctx, (ap_expr_var_func_t *)node->node_arg1,
+                                  node->node_arg2);
         break;
     case op_Concat:
         if (((ap_expr_t *)node->node_arg2)->node_op != op_Concat) {
@@ -674,7 +675,7 @@ static void expr_dump_tree(const ap_expr_t *e, const server_rec *s,
 static int ap_expr_eval_unary_op(ap_expr_eval_ctx_t *ctx, const ap_expr_t *info,
                                  const ap_expr_t *arg)
 {
-    ap_expr_op_unary_t *op_func = info->node_arg1;
+    ap_expr_op_unary_t *op_func = (ap_expr_op_unary_t *)info->node_arg1;
     const void *data = info->node_arg2;
 
     AP_DEBUG_ASSERT(info->node_op == op_UnaryOpInfo);
@@ -687,7 +688,7 @@ static int ap_expr_eval_binary_op(ap_expr_eval_ctx_t *ctx,
                                   const ap_expr_t *info,
                                   const ap_expr_t *args)
 {
-    ap_expr_op_binary_t *op_func = info->node_arg1;
+    ap_expr_op_binary_t *op_func = (ap_expr_op_binary_t *)info->node_arg1;
     const void *data = info->node_arg2;
     const ap_expr_t *a1 = args->node_arg1;
     const ap_expr_t *a2 = args->node_arg2;