Merge pull request #3006 from cremno/remove-ifdef-mrb_fixnum_shift

remove ifdef as MRB_FIXNUM_SHIFT is always defined

Merge pull request #3006 from cremno/remove-ifdef-mrb_fixnum_shift
remove ifdef as MRB_FIXNUM_SHIFT is always defined
7090b5f0 · Yukihiro "Matz" Matsumoto · b65bd377 · d109e5b4 · 7090b5f0
Commit 7090b5f0 authored Nov 08, 2015 by Yukihiro "Matz" Matsumoto
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

include/mruby/numeric.h include/mruby/numeric.h +1 -5

No files found.
--- a/include/mruby/numeric.h
+++ b/include/mruby/numeric.h
@@ -35,11 +35,7 @@ mrb_value mrb_num_div(mrb_state *mrb, mrb_value x, mrb_value y);
 #define MRB_UINT_MAKE(n) MRB_UINT_MAKE2(n)
 #define mrb_uint MRB_UINT_MAKE(MRB_INT_BIT)

-#ifdef MRB_WORD_BOXING
-# define MRB_INT_OVERFLOW_MASK ((mrb_uint)1 << (MRB_INT_BIT - 1 - MRB_FIXNUM_SHIFT))
-#else
-# define MRB_INT_OVERFLOW_MASK ((mrb_uint)1 << (MRB_INT_BIT - 1))
-#endif
+#define MRB_INT_OVERFLOW_MASK ((mrb_uint)1 << (MRB_INT_BIT - 1 - MRB_FIXNUM_SHIFT))

 /* Idea from Potion: https://github.com/perl11/potion (MIT) */
 #if (defined(__clang__) && ((__clang_major__ > 3) || (__clang_major__ == 3 && __clang_minor__ >= 4))) \