Commit 9445a059 authored by Ryan C. Gordon's avatar Ryan C. Gordon

Mac OS X thinks we want a function call to SDL_memcpy() and not memcpy() here,

 thanks to macro replacement issues.

--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402521
parent 739cd03b
...@@ -610,7 +610,6 @@ DEFAULT_MMAP_THRESHOLD default: 256K ...@@ -610,7 +610,6 @@ DEFAULT_MMAP_THRESHOLD default: 256K
#endif /* MALLINFO_FIELD_TYPE */ #endif /* MALLINFO_FIELD_TYPE */
#define memset SDL_memset #define memset SDL_memset
#define memcpy SDL_memcpy
#define malloc SDL_malloc #define malloc SDL_malloc
#define calloc SDL_calloc #define calloc SDL_calloc
#define realloc SDL_realloc #define realloc SDL_realloc
...@@ -3839,7 +3838,7 @@ static void* internal_realloc(mstate m, void* oldmem, size_t bytes) { ...@@ -3839,7 +3838,7 @@ static void* internal_realloc(mstate m, void* oldmem, size_t bytes) {
void* newmem = internal_malloc(m, bytes); void* newmem = internal_malloc(m, bytes);
if (newmem != 0) { if (newmem != 0) {
size_t oc = oldsize - overhead_for(oldp); 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); internal_free(m, oldmem);
} }
return newmem; return newmem;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment