From: Wolfgang (Blub) Bumiller <blub@speed.at>
Date: Thu, 16 Aug 2012 10:38:00 +0000 (+0200)
Subject: cast mem_a returns in util_getline
X-Git-Tag: 0.1-rc1~265
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=78971ab85a64c6ad2c2ec6a3ac7a74df3fd88f4a;p=xonotic%2Fgmqcc.git

cast mem_a returns in util_getline
---

diff --git a/util.c b/util.c
index d105cfd..eb541e4 100644
--- a/util.c
+++ b/util.c
@@ -329,7 +329,7 @@ int util_getline(char **lineptr, size_t *n, FILE *stream) {
     if (!lineptr || !n || !stream)
         return -1;
     if (!*lineptr) {
-        if (!(*lineptr = mem_a((*n=64))))
+        if (!(*lineptr = (char*)mem_a((*n=64))))
             return -1;
     }
 
@@ -340,7 +340,7 @@ int util_getline(char **lineptr, size_t *n, FILE *stream) {
         int c = getc(stream);
 
         if (chr < 2) {
-            char *tmp = mem_a((*n+=(*n>16)?*n:64));
+            char *tmp = (char*)mem_a((*n+=(*n>16)?*n:64));
             if  (!tmp)
                 return -1;