From c03769495778bad118b3c59d3cbd05c417e40b9e Mon Sep 17 00:00:00 2001 From: Damien George Date: Fri, 13 Jun 2014 22:33:31 +0100 Subject: [PATCH] py, gc: Revert ret_ptr to void*, casting to byte* for memset. --- py/gc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/py/gc.c b/py/gc.c index 452736b6d..30bae5054 100644 --- a/py/gc.c +++ b/py/gc.c @@ -400,14 +400,14 @@ found: } // get pointer to first block - byte *ret_ptr = (byte*)(gc_pool_start + start_block * WORDS_PER_BLOCK); + void *ret_ptr = (void*)(gc_pool_start + start_block * WORDS_PER_BLOCK); // zero out the additional bytes of the newly allocated blocks // This is needed because the blocks may have previously held pointers // to the heap and will not be set to something else if the caller // doesn't actually use the entire block. As such they will continue // to point to the heap and may prevent other blocks from being reclaimed. - memset(ret_ptr + n_bytes, 0, (end_block - start_block + 1) * BYTES_PER_BLOCK - n_bytes); + memset((byte*)ret_ptr + n_bytes, 0, (end_block - start_block + 1) * BYTES_PER_BLOCK - n_bytes); #if MICROPY_ENABLE_FINALISER if (has_finaliser) {