Mercurial > sdl-ios-xcode
changeset 4061:95ecf165f113 SDL-1.2
Mac OS X thinks we want a function call to SDL_memcpy() and not memcpy() here,
thanks to macro replacement issues.
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Sat, 14 Jul 2007 06:45:01 +0000 |
| parents | 0b4ebec67cad |
| children | ee5a38285651 |
| 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 Fri Jul 13 18:44:43 2007 +0000 +++ b/src/stdlib/SDL_malloc.c Sat Jul 14 06:45:01 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 @@ -3839,7 +3838,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;