diff options
| -rw-r--r-- | include/mruby/array.h | 3 | ||||
| -rw-r--r-- | src/array.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/mruby/array.h b/include/mruby/array.h index 11c36b675..542715554 100644 --- a/include/mruby/array.h +++ b/include/mruby/array.h @@ -43,9 +43,8 @@ struct RArray { #define MRB_ARY_EMBED_MASK 7 #define ARY_EMBED_P(a) ((a)->flags & MRB_ARY_EMBED_MASK) -//#define ARY_SET_EMBED_FLAG(a) ((a)->flags |= MRB_ARY_EMBED) #define ARY_UNSET_EMBED_FLAG(a) ((a)->flags &= ~(MRB_ARY_EMBED_MASK)) -#define ARY_EMBED_LEN(a) (((a)->flags & MRB_ARY_EMBED_MASK) - 1) +#define ARY_EMBED_LEN(a) ((mrb_int)(((a)->flags & MRB_ARY_EMBED_MASK) - 1)) #define ARY_SET_EMBED_LEN(a,len) ((a)->flags = ((a)->flags&~MRB_ARY_EMBED_MASK) | (len + 1)) #define ARY_EMBED_PTR(a) (&((a)->as.embed[0])) diff --git a/src/array.c b/src/array.c index c6cca3816..0360f2177 100644 --- a/src/array.c +++ b/src/array.c @@ -14,7 +14,7 @@ #define ARY_DEFAULT_LEN 4 #define ARY_SHRINK_RATIO 5 /* must be larger than 2 */ #define ARY_C_MAX_SIZE (SIZE_MAX / sizeof(mrb_value)) -#define ARY_MAX_SIZE ((ARY_C_MAX_SIZE < (size_t)MRB_INT_MAX) ? (mrb_int)ARY_C_MAX_SIZE : MRB_INT_MAX-1) +#define ARY_MAX_SIZE ((mrb_int)((ARY_C_MAX_SIZE < (size_t)MRB_INT_MAX) ? ARY_C_MAX_SIZE : MRB_INT_MAX-1)) static struct RArray* ary_new_capa(mrb_state *mrb, mrb_int capa) |