]> git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
fix a Mem_Alloc call that needs a type cast in C++
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 7 Feb 2013 11:42:21 +0000 (11:42 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 7 Feb 2013 11:42:21 +0000 (11:42 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11890 d7cf8633-e32d-0410-b094-e92efae38249

gl_rmain.c

index 5b816ae6a3f59cf9f1c6c3c82982e8f2471d2756..f0937df38696318cf6021c8df6f85b480dab913c 100644 (file)
@@ -984,7 +984,7 @@ static char *R_ShaderStrCat(const char **strings)
        for (p = strings;(t = *p);p++)
                len += strlen(t);
        len++;
-       s = string = Mem_Alloc(r_main_mempool, len);
+       s = string = (char *)Mem_Alloc(r_main_mempool, len);
        len = 0;
        for (p = strings;(t = *p);p++)
        {