Mercurial > sdl-ios-xcode
diff src/video/dummy/SDL_nullvideo.c @ 1720:a1ebb17f9c52 SDL-1.3
Cleaned up a bunch of warnings, started adding Win32 event support
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Fri, 30 Jun 2006 05:42:49 +0000 |
parents | 80a5e6a4e1e2 |
children | 98a3207ddde8 |
line wrap: on
line diff
--- a/src/video/dummy/SDL_nullvideo.c Wed Jun 28 08:12:07 2006 +0000 +++ b/src/video/dummy/SDL_nullvideo.c Fri Jun 30 05:42:49 2006 +0000 @@ -69,7 +69,6 @@ static void DUMMY_DeleteDevice(SDL_VideoDevice * device) { - SDL_free(device->hidden); SDL_free(device); } @@ -79,20 +78,14 @@ SDL_VideoDevice *device; /* Initialize all variables that we clean on shutdown */ - device = (SDL_VideoDevice *) SDL_malloc(sizeof(SDL_VideoDevice)); - if (device) { - SDL_memset(device, 0, (sizeof *device)); - device->hidden = (struct SDL_PrivateVideoData *) - SDL_malloc((sizeof *device->hidden)); - } - if ((device == NULL) || (device->hidden == NULL)) { + device = (SDL_VideoDevice *) SDL_calloc(1, sizeof(SDL_VideoDevice)); + if (!device) { SDL_OutOfMemory(); if (device) { SDL_free(device); } return (0); } - SDL_memset(device->hidden, 0, (sizeof *device->hidden)); /* Set the function pointers */ device->VideoInit = DUMMY_VideoInit;