Mercurial > sdl-ios-xcode
changeset 4063:d634945c6172 SDL-1.2
Reverted r3255:3256. Don't actually need it unless the build is broken. :)
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Sat, 14 Jul 2007 07:06:46 +0000 |
| parents | ee5a38285651 |
| children | 940fddb81bea |
| files | src/stdlib/SDL_malloc.c |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/stdlib/SDL_malloc.c Sat Jul 14 07:01:38 2007 +0000 +++ b/src/stdlib/SDL_malloc.c Sat Jul 14 07:06:46 2007 +0000 @@ -610,6 +610,7 @@ #endif /* MALLINFO_FIELD_TYPE */ #define memset SDL_memset +#define memcpy SDL_memcpy #define malloc SDL_malloc #define calloc SDL_calloc #define realloc SDL_realloc @@ -3838,7 +3839,7 @@ void* newmem = internal_malloc(m, bytes); if (newmem != 0) { size_t oc = oldsize - overhead_for(oldp); - SDL_memcpy(newmem, oldmem, (oc < bytes)? oc : bytes); + memcpy(newmem, oldmem, (oc < bytes)? oc : bytes); internal_free(m, oldmem); } return newmem;