Mercurial > sdl-ios-xcode
changeset 2194:55e987d8e1b5
Merged r3255:3256 from branches/SDL-1.2: stdlib problem with SDL_memcpy macro.
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Sat, 14 Jul 2007 06:46:33 +0000 |
| parents | e857f02e709e |
| children | 46e373b27d6d |
| files | src/stdlib/SDL_malloc.c |
| diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/stdlib/SDL_malloc.c Sat Jul 14 00:07:37 2007 +0000 +++ b/src/stdlib/SDL_malloc.c Sat Jul 14 06:46:33 2007 +0000 @@ -610,7 +610,6 @@ #endif /* MALLINFO_FIELD_TYPE */ #define memset SDL_memset -#define memcpy SDL_memcpy #define malloc SDL_malloc #define calloc SDL_calloc #define realloc SDL_realloc @@ -3913,7 +3912,7 @@ void *newmem = internal_malloc(m, bytes); if (newmem != 0) { size_t oc = oldsize - overhead_for(oldp); - memcpy(newmem, oldmem, (oc < bytes) ? oc : bytes); + SDL_memcpy(newmem, oldmem, (oc < bytes) ? oc : bytes); internal_free(m, oldmem); } return newmem;