]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
fix one C++ compile error. It looks like we have no more wrong declaration of functio...
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Tue, 18 Oct 2011 07:00:38 +0000 (07:00 +0000)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 18 Oct 2011 13:05:20 +0000 (15:05 +0200)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11442 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=bc33af16978d2aca67b4d0bf337bb35ebfff4a08

vid_sdl.c

index 5eba5d05631bce31836ffd2a5c51d6b1d3b64dd6..f72abea1021527172cc6898a02cff498bddd2f1b 100644 (file)
--- 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;