From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 13 Nov 2011 02:39:46 +0000 (+0000)
Subject: fix C++ compile error (missing cast)
X-Git-Tag: xonotic-v0.6.0~163^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2c49845a7e2ee4b5c98a652f7f7414da32cb6b06;p=xonotic%2Fdarkplaces.git

fix C++ compile error (missing cast)


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

diff --git a/cl_demo.c b/cl_demo.c
index 5ca4780e..e60ac367 100644
--- a/cl_demo.c
+++ b/cl_demo.c
@@ -510,7 +510,7 @@ static void CL_FinishTimeDemo (void)
 		{
 			static benchmarkhistory_t *history = NULL;
 			if(!history)
-				history = Z_Malloc(sizeof(*history) * atoi(com_argv[i + 1]));
+				history = (benchmarkhistory_t *)Z_Malloc(sizeof(*history) * atoi(com_argv[i + 1]));
 
 			history[benchmark_runs - 1].frames = frames;
 			history[benchmark_runs - 1].time = time;