pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged r3255:3256 from branches/SDL-1.2: stdlib problem with SDL_memcpy macro.

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402522
This commit is contained in:
Ryan C. Gordon 2007-07-14 06:46:33 +00:00
parent f792ff238f
commit 73619c3660
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/stdlib/SDL_malloc.c
View file

@ -610,7 +610,6 @@ DEFAULT_MMAP_THRESHOLD default: 256K
#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 @@ internal_realloc(mstate m, void *oldmem, size_t bytes)
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;