From 280618d6f5216fd6b9deae882488c5d0795be731 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Sat, 14 Jul 2007 07:05:19 +0000 Subject: [PATCH] Reverted r3255:3256. Don't actually need it unless the build is broken. :) --HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402525 --- src/stdlib/SDL_malloc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/stdlib/SDL_malloc.c b/src/stdlib/SDL_malloc.c index 3c4c11a0b..63f851406 100644 --- a/src/stdlib/SDL_malloc.c +++ b/src/stdlib/SDL_malloc.c @@ -610,6 +610,7 @@ 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 @@ -3912,7 +3913,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); - SDL_memcpy(newmem, oldmem, (oc < bytes) ? oc : bytes); + memcpy(newmem, oldmem, (oc < bytes) ? oc : bytes); internal_free(m, oldmem); } return newmem;