diff options
author | Kenneth Graunke <[email protected]> | 2010-02-18 23:50:59 -0800 |
---|---|---|
committer | Kristian Høgsberg <[email protected]> | 2010-02-19 09:18:36 -0500 |
commit | c7ac486261ad30ef654f6d0b1608da4e8483cd40 (patch) | |
tree | aff75a4e4b0a35d39d699ac80cc5bd1c66cc546d /src/mesa/main/imports.c | |
parent | 60b0cae412029e53654f38d0de151908f1feb310 (diff) |
Remove _mesa_memcpy in favor of plain memcpy.
This may break the SUNOS4 build, but it's no longer relevant.
Diffstat (limited to 'src/mesa/main/imports.c')
-rw-r--r-- | src/mesa/main/imports.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c index 2a0952c7afc..0abdfca381e 100644 --- a/src/mesa/main/imports.c +++ b/src/mesa/main/imports.c @@ -221,7 +221,7 @@ _mesa_align_realloc(void *oldBuffer, size_t oldSize, size_t newSize, const size_t copySize = (oldSize < newSize) ? oldSize : newSize; void *newBuf = _mesa_align_malloc(newSize, alignment); if (newBuf && oldBuffer && copySize > 0) { - _mesa_memcpy(newBuf, oldBuffer, copySize); + memcpy(newBuf, oldBuffer, copySize); } if (oldBuffer) _mesa_align_free(oldBuffer); @@ -238,23 +238,12 @@ _mesa_realloc(void *oldBuffer, size_t oldSize, size_t newSize) const size_t copySize = (oldSize < newSize) ? oldSize : newSize; void *newBuffer = _mesa_malloc(newSize); if (newBuffer && oldBuffer && copySize > 0) - _mesa_memcpy(newBuffer, oldBuffer, copySize); + memcpy(newBuffer, oldBuffer, copySize); if (oldBuffer) _mesa_free(oldBuffer); return newBuffer; } -/** memcpy wrapper */ -void * -_mesa_memcpy(void *dest, const void *src, size_t n) -{ -#if defined(SUNOS4) - return memcpy((char *) dest, (char *) src, (int) n); -#else - return memcpy(dest, src, n); -#endif -} - /** Wrapper around memset() */ void _mesa_memset( void *dst, int val, size_t n ) |