Mercurial > sdl-ios-xcode
diff src/video/gem/SDL_gemvideo.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/gem/SDL_gemvideo.c Mon Feb 06 17:28:04 2006 +0000 +++ b/src/video/gem/SDL_gemvideo.c Tue Feb 07 06:59:48 2006 +0000 @@ -125,8 +125,8 @@ static void GEM_DeleteDevice(SDL_VideoDevice *device) { - free(device->hidden); - free(device); + SDL_free(device->hidden); + SDL_free(device); } static SDL_VideoDevice *GEM_CreateDevice(int devindex) @@ -136,23 +136,23 @@ unsigned long dummy; /* 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)); device->gl_data = (struct SDL_PrivateGLData *) - malloc((sizeof *device->gl_data)); + SDL_malloc((sizeof *device->gl_data)); } if ( (device == NULL) || (device->hidden == NULL) ) { SDL_OutOfMemory(); if ( device ) { - free(device); + SDL_free(device); } return(0); } - memset(device->hidden, 0, (sizeof *device->hidden)); - memset(device->gl_data, 0, sizeof(*device->gl_data)); + SDL_memset(device->hidden, 0, (sizeof *device->hidden)); + SDL_memset(device->gl_data, 0, sizeof(*device->gl_data)); /* Set the function pointers */ device->VideoInit = GEM_VideoInit; @@ -400,7 +400,7 @@ VDI_oldpalette[i][2] = rgb[2]; } VDI_setpalette = GEM_SetNewPalette; - memcpy(VDI_curpalette,VDI_oldpalette,sizeof(VDI_curpalette)); + SDL_memcpy(VDI_curpalette,VDI_oldpalette,sizeof(VDI_curpalette)); /* Setup screen info */ GEM_title_name = empty_name; @@ -453,7 +453,7 @@ GEM_menubar=Atari_SysMalloc(menubar_size,MX_PREFTTRAM); /* Fill video modes list */ - SDL_modelist[0] = malloc(sizeof(SDL_Rect)); + SDL_modelist[0] = SDL_malloc(sizeof(SDL_Rect)); SDL_modelist[0]->x = 0; SDL_modelist[0]->y = 0; SDL_modelist[0]->w = VDI_w; @@ -679,7 +679,7 @@ SDL_SetError("Can not allocate %d KB for frame buffer", screensize>>10); return NULL; } - memset(GEM_buffer1, 0, screensize); + SDL_memset(GEM_buffer1, 0, screensize); #ifdef DEBUG_VIDEO_GEM printf("sdl:video:gem: setvideomode(): allocated buffer 1\n"); #endif @@ -691,7 +691,7 @@ SDL_SetError("Can not allocate %d KB for shadow buffer", screensize>>10); return NULL; } - memset(GEM_buffer2, 0, screensize); + SDL_memset(GEM_buffer2, 0, screensize); #ifdef DEBUG_VIDEO_GEM printf("sdl:video:gem: setvideomode(): allocated buffer 2\n"); #endif @@ -1132,7 +1132,7 @@ /* Free mode list */ if (SDL_modelist[0]) { - free(SDL_modelist[0]); + SDL_free(SDL_modelist[0]); SDL_modelist[0]=NULL; }