summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2015-11-08 21:38:47 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2015-11-08 21:38:47 +0900
commit7090b5f07ae735e97d8df6a02d0fd8efd2aad965 (patch)
tree89d2c44432867fb1b01894da72f559922c947971
parentb65bd3778de54100989d174afdc7495667098838 (diff)
parentd109e5b4e13da4f734c6884fb4c48787076ba2b8 (diff)
downloadmruby-7090b5f07ae735e97d8df6a02d0fd8efd2aad965.tar.gz
mruby-7090b5f07ae735e97d8df6a02d0fd8efd2aad965.zip
Merge pull request #3006 from cremno/remove-ifdef-mrb_fixnum_shift
remove ifdef as MRB_FIXNUM_SHIFT is always defined
-rw-r--r--include/mruby/numeric.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/include/mruby/numeric.h b/include/mruby/numeric.h
index 6366e8674..90cbd40eb 100644
--- 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))) \