From 0c96b936dcbbc88ca1bacafa8b25d3e924839367 Mon Sep 17 00:00:00 2001 From: cremno Date: Fri, 7 Mar 2014 20:48:44 +0100 Subject: MSVC: fix C4146 C4146 (unary minus operator applied to unsigned type, result still unsigned) --- src/pool.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/pool.c') diff --git a/src/pool.c b/src/pool.c index f09df92c5..67eb4d2e5 100644 --- a/src/pool.c +++ b/src/pool.c @@ -5,6 +5,7 @@ */ #include +#include #include #include "mruby.h" @@ -41,7 +42,7 @@ struct mrb_pool { #endif #ifdef POOL_ALIGNMENT -# define ALIGN_PADDING(x) ((-x) & (POOL_ALIGNMENT - 1)) +# define ALIGN_PADDING(x) ((SIZE_MAX - (x) + 1) & (POOL_ALIGNMENT - 1)) #else # define ALIGN_PADDING(x) (0) #endif -- cgit v1.2.3 From 307c356c8a5f17de2f7fc6603a37b168ef2d3fdd Mon Sep 17 00:00:00 2001 From: cremno Date: Fri, 7 Mar 2014 20:55:11 +0100 Subject: pool: use mrb_malloc_simple instead of mrb_malloc --- src/pool.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/pool.c') diff --git a/src/pool.c b/src/pool.c index 67eb4d2e5..4d8c42dd1 100644 --- a/src/pool.c +++ b/src/pool.c @@ -37,7 +37,7 @@ struct mrb_pool { #undef TEST_POOL #ifdef TEST_POOL -#define mrb_malloc(m,s) malloc(s) +#define mrb_malloc_simple(m,s) malloc(s) #define mrb_free(m,p) free(p) #endif @@ -50,7 +50,7 @@ struct mrb_pool { mrb_pool* mrb_pool_open(mrb_state *mrb) { - mrb_pool *pool = (mrb_pool *)mrb_malloc(mrb, sizeof(mrb_pool)); + mrb_pool *pool = (mrb_pool *)mrb_malloc_simple(mrb, sizeof(mrb_pool)); if (pool) { pool->mrb = mrb; @@ -82,7 +82,7 @@ page_alloc(mrb_pool *pool, size_t len) if (len < POOL_PAGE_SIZE) len = POOL_PAGE_SIZE; - page = (struct mrb_pool_page *)mrb_malloc(pool->mrb, sizeof(struct mrb_pool_page)+len); + page = (struct mrb_pool_page *)mrb_malloc_simple(pool->mrb, sizeof(struct mrb_pool_page)+len); if (page) { page->offset = 0; page->len = len; -- cgit v1.2.3