src/stdlib/SDL_malloc.c
branchSDL-1.2
changeset 4061 95ecf165f113
parent 1465 8dfa9a6d69a5
child 4063 d634945c6172
     1.1 --- a/src/stdlib/SDL_malloc.c	Fri Jul 13 18:44:43 2007 +0000
     1.2 +++ b/src/stdlib/SDL_malloc.c	Sat Jul 14 06:45:01 2007 +0000
     1.3 @@ -610,7 +610,6 @@
     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 @@ -3839,7 +3838,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 -        memcpy(newmem, oldmem, (oc < bytes)? oc : bytes);
    1.16 +        SDL_memcpy(newmem, oldmem, (oc < bytes)? oc : bytes);
    1.17          internal_free(m, oldmem);
    1.18        }
    1.19        return newmem;