rename ALIGN macros

This commit is contained in:
Yukihiro Matsumoto
2012-05-07 23:23:36 +09:00
parent b45c8b8d03
commit c95279c6bf
+7 -7
View File
@@ -17,10 +17,10 @@
#define POOL_PAGE_SIZE 16000
#ifdef ALLOC_PADDING
# define CALC_ALIGN_PADDING(x) ((x % ALLOC_PADDING) ? ALLOC_PADDING - (x % ALLOC_PADDING) : 0)
#ifdef ALLOC_ALIGN
# define ALIGN_PADDING(x) ((x % ALLOC_ALIGN) ? ALLOC_ALIGN - (x % ALLOC_ALLOC) : 0)
#else
# define CALC_ALIGN_PADDING(x) (0)
# define ALIGN_PADDING(x) (0)
#endif
mrb_pool*
@@ -74,7 +74,7 @@ mrb_pool_alloc(mrb_pool *pool, size_t len)
size_t n;
if (!pool) return 0;
len += CALC_ALIGN_PADDING(len);
len += ALIGN_PADDING(len);
page = pool->pages;
while (page) {
if (page->offset + len <= page->len) {
@@ -101,7 +101,7 @@ mrb_pool_can_realloc(mrb_pool *pool, void *p, size_t len)
struct mrb_pool_page *page;
if (!pool) return 0;
len += CALC_ALIGN_PADDING(len);
len += ALIGN_PADDING(len);
page = pool->pages;
while (page) {
if (page->last == p) {
@@ -123,8 +123,8 @@ mrb_pool_realloc(mrb_pool *pool, void *p, size_t oldlen, size_t newlen)
void *np;
if (!pool) return 0;
oldlen += CALC_ALIGN_PADDING(oldlen);
newlen += CALC_ALIGN_PADDING(newlen);
oldlen += ALIGN_PADDING(oldlen);
newlen += ALIGN_PADDING(newlen);
page = pool->pages;
while (page) {
if (page->last == p) {