From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 18 Oct 2011 07:00:38 +0000 (+0000)
Subject: fix one C++ compile error. It looks like we have no more wrong declaration of functio... 
X-Git-Tag: xonotic-v0.6.0~241
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6f5937ba23937f9baec2a3ddc849a4d402874846;p=xonotic%2Fdarkplaces.git

fix one C++ compile error. It looks like we have no more wrong declaration of function issues, as C++ name mangling should have detected them.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11442 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=bc33af16978d2aca67b4d0bf337bb35ebfff4a08
---

diff --git a/vid_sdl.c b/vid_sdl.c
index 5eba5d05..f72abea1 100644
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -1810,7 +1810,7 @@ static SDL_Surface *VID_WrapSDL_SetVideoMode(int screenwidth, int screenheight,
 
 			// reallocate with malloc, as this is in tempmempool (do not want)
 			xpm = data;
-			data = malloc(width * height * 4);
+			data = (char *) malloc(width * height * 4);
 			memcpy(data, xpm, width * height * 4);
 			Mem_Free(xpm);
 			xpm = NULL;