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... --HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401340
This commit is contained in:
parent
00f6d8e5e3
commit
5d53175e4d
212 changed files with 1840 additions and 1884 deletions
|
@ -238,11 +238,11 @@ static void DSp_DeleteDevice(SDL_VideoDevice *device)
|
|||
if (device->hidden) {
|
||||
|
||||
if (device->hidden->dspinfo)
|
||||
free(device->hidden->dspinfo);
|
||||
SDL_free(device->hidden->dspinfo);
|
||||
|
||||
free(device->hidden);
|
||||
SDL_free(device->hidden);
|
||||
}
|
||||
free(device);
|
||||
SDL_free(device);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -251,13 +251,13 @@ static SDL_VideoDevice *DSp_CreateDevice(int devindex)
|
|||
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->hidden)
|
||||
memset(device->hidden, 0, sizeof ( *(device->hidden) ) );
|
||||
SDL_memset(device->hidden, 0, sizeof ( *(device->hidden) ) );
|
||||
}
|
||||
if ( (device == NULL) || (device->hidden == NULL) ) {
|
||||
SDL_OutOfMemory();
|
||||
|
@ -267,22 +267,22 @@ static SDL_VideoDevice *DSp_CreateDevice(int devindex)
|
|||
if (device->hidden)
|
||||
free (device->hidden);
|
||||
|
||||
free(device);
|
||||
SDL_free(device);
|
||||
}
|
||||
|
||||
return(NULL);
|
||||
}
|
||||
|
||||
/* Allocate DrawSprocket information */
|
||||
device->hidden->dspinfo = (struct DSpInfo *)malloc(
|
||||
device->hidden->dspinfo = (struct DSpInfo *)SDL_malloc(
|
||||
(sizeof *device->hidden->dspinfo));
|
||||
if ( device->hidden->dspinfo == NULL ) {
|
||||
SDL_OutOfMemory();
|
||||
free(device->hidden);
|
||||
free(device);
|
||||
SDL_free(device->hidden);
|
||||
SDL_free(device);
|
||||
return(0);
|
||||
}
|
||||
memset(device->hidden->dspinfo, 0, (sizeof *device->hidden->dspinfo));
|
||||
SDL_memset(device->hidden->dspinfo, 0, (sizeof *device->hidden->dspinfo));
|
||||
|
||||
/* Set the function pointers */
|
||||
device->VideoInit = DSp_VideoInit;
|
||||
|
@ -1384,9 +1384,9 @@ void DSp_VideoQuit(_THIS)
|
|||
/* 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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue