# HG changeset patch # User Ryan C. Gordon # Date 1184396806 0 # Node ID d634945c6172d62eeefd4227adaf431f07c35ba2 # Parent ee5a38285651d4e8dcd73588067ba2268ff8b851 Reverted r3255:3256. Don't actually need it unless the build is broken. :) diff -r ee5a38285651 -r d634945c6172 src/stdlib/SDL_malloc.c --- 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;