Reverted r3255:3256. Don't actually need it unless the build is broken. :)
authorRyan C. Gordon <icculus@icculus.org>
Sat, 14 Jul 2007 07:05:19 +0000
changeset 21962aee80dab68a
parent 2195 46e373b27d6d
child 2197 2ff40f30af31
Reverted r3255:3256. Don't actually need it unless the build is broken. :)
src/stdlib/SDL_malloc.c
     1.1 --- a/src/stdlib/SDL_malloc.c	Sat Jul 14 07:03:07 2007 +0000
     1.2 +++ b/src/stdlib/SDL_malloc.c	Sat Jul 14 07:05:19 2007 +0000
     1.3 @@ -610,6 +610,7 @@
     1.4  #endif /* MALLINFO_FIELD_TYPE */
     1.5  
     1.6  #define memset	SDL_memset
     1.7 +#define memcpy	SDL_memcpy
     1.8  #define malloc	SDL_malloc
     1.9  #define calloc	SDL_calloc
    1.10  #define realloc	SDL_realloc
    1.11 @@ -3912,7 +3913,7 @@
    1.12              void *newmem = internal_malloc(m, bytes);
    1.13              if (newmem != 0) {
    1.14                  size_t oc = oldsize - overhead_for(oldp);
    1.15 -                SDL_memcpy(newmem, oldmem, (oc < bytes) ? oc : bytes);
    1.16 +                memcpy(newmem, oldmem, (oc < bytes) ? oc : bytes);
    1.17                  internal_free(m, oldmem);
    1.18              }
    1.19              return newmem;