From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 7 Feb 2013 11:42:21 +0000 (+0000)
Subject: fix a Mem_Alloc call that needs a type cast in C++
X-Git-Tag: xonotic-v0.8.0~96^2~149
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=62b25322a89903f93c7b7feec87023bd653db73c;p=xonotic%2Fdarkplaces.git

fix a Mem_Alloc call that needs a type cast in C++


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11890 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/gl_rmain.c b/gl_rmain.c
index 5b816ae6..f0937df3 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -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++)
 	{