Mercurial > sdl-ios-xcode
diff src/video/macrom/SDL_romvideo.c @ 1336:3692456e7b0f
Use SDL_ prefixed versions of C library functions.
FIXME:
Change #include <stdlib.h> to #include "SDL_stdlib.h"
Change #include <string.h> to #include "SDL_string.h"
Make sure nothing else broke because of this...
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Tue, 07 Feb 2006 06:59:48 +0000 |
| parents | c9b51268668f |
| children | 604d73db6802 |
line wrap: on
line diff
--- a/src/video/macrom/SDL_romvideo.c Mon Feb 06 17:28:04 2006 +0000 +++ b/src/video/macrom/SDL_romvideo.c Tue Feb 07 06:59:48 2006 +0000 @@ -120,8 +120,8 @@ static void ROM_DeleteDevice(SDL_VideoDevice *device) { - free(device->hidden); - free(device); + SDL_free(device->hidden); + SDL_free(device); } static SDL_VideoDevice *ROM_CreateDevice(int devindex) @@ -129,20 +129,20 @@ SDL_VideoDevice *device; /* Initialize all variables that we clean on shutdown */ - device = (SDL_VideoDevice *)malloc(sizeof(SDL_VideoDevice)); + device = (SDL_VideoDevice *)SDL_malloc(sizeof(SDL_VideoDevice)); if ( device ) { - memset(device, 0, (sizeof *device)); + SDL_memset(device, 0, (sizeof *device)); device->hidden = (struct SDL_PrivateVideoData *) - malloc((sizeof *device->hidden)); + SDL_malloc((sizeof *device->hidden)); } if ( (device == NULL) || (device->hidden == NULL) ) { SDL_OutOfMemory(); if ( device ) { - free(device); + SDL_free(device); } return(0); } - memset(device->hidden, 0, (sizeof *device->hidden)); + SDL_memset(device->hidden, 0, (sizeof *device->hidden)); /* Set the function pointers */ device->VideoInit = ROM_VideoInit; @@ -231,9 +231,9 @@ SDL_CPal = NewPalette(256, SDL_CTab, pmExplicit+pmTolerant, 0); /* Get a list of available fullscreen modes */ - SDL_modelist = (SDL_Rect **)malloc((1+1)*sizeof(SDL_Rect *)); + SDL_modelist = (SDL_Rect **)SDL_malloc((1+1)*sizeof(SDL_Rect *)); if ( SDL_modelist ) { - SDL_modelist[0] = (SDL_Rect *)malloc(sizeof(SDL_Rect)); + SDL_modelist[0] = (SDL_Rect *)SDL_malloc(sizeof(SDL_Rect)); if ( SDL_modelist[0] ) { SDL_modelist[0]->x = 0; SDL_modelist[0]->y = 0; @@ -723,9 +723,9 @@ /* Free list of video modes */ if ( SDL_modelist != NULL ) { for ( i=0; SDL_modelist[i]; ++i ) { - free(SDL_modelist[i]); + SDL_free(SDL_modelist[i]); } - free(SDL_modelist); + SDL_free(SDL_modelist); SDL_modelist = NULL; } }