Reverted r3255:3256. Don't actually need it unless the build is broken. :) SDL-1.2
authorRyan C. Gordon
Sat, 14 Jul 2007 07:06:46 +0000
branchSDL-1.2
changeset 4063d634945c6172
parent 4062 ee5a38285651
child 4064 940fddb81bea
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:01:38 2007 +0000
     1.2 +++ b/src/stdlib/SDL_malloc.c	Sat Jul 14 07:06:46 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 @@ -3838,7 +3839,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;