# HG changeset patch
# User Ryan C. Gordon <icculus@icculus.org>
# Date 1184396719 0
# Node ID 2aee80dab68a635ce33266fbfe83390a9fc17817
# Parent  46e373b27d6d8d5f1a78fe27748e25988698a66c
Reverted r3255:3256. Don't actually need it unless the build is broken.  :)

diff -r 46e373b27d6d -r 2aee80dab68a src/stdlib/SDL_malloc.c
--- a/src/stdlib/SDL_malloc.c	Sat Jul 14 07:03:07 2007 +0000
+++ b/src/stdlib/SDL_malloc.c	Sat Jul 14 07:05:19 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
@@ -3912,7 +3913,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;