httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1213567 - /httpd/httpd/trunk/server/util_expr_eval.c
Date Tue, 13 Dec 2011 05:53:50 GMT
Author: sf
Date: Tue Dec 13 05:53:50 2011
New Revision: 1213567

URL: http://svn.apache.org/viewvc?rev=1213567&view=rev
Log:
Explicitly cast function pointer, to remove 'const'.
Hopefully this makes the NetWare compiler happy.

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

Modified: httpd/httpd/trunk/server/util_expr_eval.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_expr_eval.c?rev=1213567&r1=1213566&r2=1213567&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_expr_eval.c (original)
+++ httpd/httpd/trunk/server/util_expr_eval.c Tue Dec 13 05:53:50 2011
@@ -89,7 +89,8 @@ static const char *ap_expr_eval_word(ap_
         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
 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_exp
                                   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;



Mime
View raw message