# HG changeset patch
# User Ryan C. Gordon <icculus@icculus.org>
# Date 1184395593 0
# Node ID 55e987d8e1b5f1216d191d3526c497d9566f0cc1
# Parent  e857f02e709e779fdf09007492dbde12c4b807c6
Merged r3255:3256 from branches/SDL-1.2: stdlib problem with SDL_memcpy macro.

diff -r e857f02e709e -r 55e987d8e1b5 src/stdlib/SDL_malloc.c
--- a/src/stdlib/SDL_malloc.c	Sat Jul 14 00:07:37 2007 +0000
+++ b/src/stdlib/SDL_malloc.c	Sat Jul 14 06:46:33 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
@@ -3913,7 +3912,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;