diff options
| author | tron <tron@openttd.org> | 2004-11-15 10:31:48 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2004-11-15 10:31:48 +0000 |
| commit | 57c472e093aad072d5c4113790dfafbca0f40fa6 (patch) | |
| tree | 33cba4e194270ded85bd9c544bbf733f90eda205 /spritecache.c | |
| parent | 01e88bb61d00c96991d9280cea6bc188cc42db33 (diff) | |
| download | openttd-57c472e093aad072d5c4113790dfafbca0f40fa6.tar.xz | |
(svn r624) Merge r377 to trunk:
Remove the memmove special case for MSVC
According to the MSDN it was just plain wrong and memmove was directly used in some places anyway
Diffstat (limited to 'spritecache.c')
| -rw-r--r-- | spritecache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spritecache.c b/spritecache.c index 40e544b46..4c7aeff71 100644 --- a/spritecache.c +++ b/spritecache.c @@ -524,7 +524,7 @@ static void CompactSpriteCache() _sprite_ptr[i] -= size; // Move the memory - memcpy_overlapping(s+S_HDRSIZE, s+S_HDRSIZE+size, sizeb - S_HDRSIZE ); + memmove(s + S_HDRSIZE, s + S_HDRSIZE + size, sizeb - S_HDRSIZE); // What we just did had the effect of swapping the allocated block with the free block, so we need to update // the block pointers. First update the allocated one. It is in use. |