From: Wolfgang (Blub) Bumiller <blub@speed.at>
Date: Thu, 16 Aug 2012 10:34:28 +0000 (+0200)
Subject: add some missing casts to some mem_a
X-Git-Tag: 0.1-rc1~266
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ba1886ad31e0d20f48db4660305e5a8002cb3978;p=xonotic%2Fgmqcc.git

add some missing casts to some mem_a
---

diff --git a/parser.c b/parser.c
index a0bb6f9..aa17216 100644
--- a/parser.c
+++ b/parser.c
@@ -1705,9 +1705,9 @@ static bool parser_variable(parser_t *parser, ast_block *localblock)
             vx.var = (ast_expression*)ast_member_new(var->expression.node.context, (ast_expression*)var, 0);
             vy.var = (ast_expression*)ast_member_new(var->expression.node.context, (ast_expression*)var, 1);
             vz.var = (ast_expression*)ast_member_new(var->expression.node.context, (ast_expression*)var, 2);
-            vx.name = mem_a(len+3);
-            vy.name = mem_a(len+3);
-            vz.name = mem_a(len+3);
+            vx.name = (char*)mem_a(len+3);
+            vy.name = (char*)mem_a(len+3);
+            vz.name = (char*)mem_a(len+3);
             memcpy(vx.name, varent.name, len);
             memcpy(vy.name, varent.name, len);
             memcpy(vz.name, varent.name, len);
@@ -1957,9 +1957,9 @@ static bool parser_do(parser_t *parser)
                 vx.var = (ast_expression*)ast_member_new(ast_ctx(fld), (ast_expression*)fld, 0);
                 vy.var = (ast_expression*)ast_member_new(ast_ctx(fld), (ast_expression*)fld, 1);
                 vz.var = (ast_expression*)ast_member_new(ast_ctx(fld), (ast_expression*)fld, 2);
-                vx.name = mem_a(len+3);
-                vy.name = mem_a(len+3);
-                vz.name = mem_a(len+3);
+                vx.name = (char*)mem_a(len+3);
+                vy.name = (char*)mem_a(len+3);
+                vz.name = (char*)mem_a(len+3);
                 memcpy(vx.name, varent.name, len);
                 memcpy(vy.name, varent.name, len);
                 memcpy(vz.name, varent.name, len);