From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 14 Dec 2009 01:04:10 +0000 (+0000)
Subject: fix void * arithmetic error on MSVC
X-Git-Tag: xonotic-v0.1.0preview~1067
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6776e2ab1af13d2712701f12321fb30db9354df6;p=xonotic%2Fdarkplaces.git

fix void * arithmetic error on MSVC


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

diff --git a/gl_rmain.c b/gl_rmain.c
index 671786c8..8ae40577 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -3402,7 +3402,7 @@ void *R_FrameData_Alloc(size_t size)
 
 	// align to 16 byte boundary
 	size = (size + 15) & ~15;
-	data = r_framedata_base + r_framedata_current;
+	data = (void *)((unsigned char*)r_framedata_base + r_framedata_current);
 	r_framedata_current += size;
 
 	// check overflow