From 1298366293db43977d6e4f4d21dd7706b83b7907 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Sat, 14 Jul 2007 06:46:33 +0000 Subject: [PATCH] Merged r3255:3256 from branches/SDL-1.2: stdlib problem with SDL_memcpy macro. --- src/stdlib/SDL_malloc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/stdlib/SDL_malloc.c b/src/stdlib/SDL_malloc.c index 63f851406..3c4c11a0b 100644 --- a/src/stdlib/SDL_malloc.c +++ b/src/stdlib/SDL_malloc.c @@ -610,7 +610,6 @@ DEFAULT_MMAP_THRESHOLD default: 256K #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 @@ internal_realloc(mstate m, void *oldmem, size_t bytes) 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;