Merge pull request #377 from msgpack/remove-ifdef-jruby

byroot · web-flow · commit 13d4469009d1 · 2024-11-12T16:28:27.000+01:00
Remove outdated JRUBY ifdefs
diff --git a/ext/msgpack/packer.h b/ext/msgpack/packer.h
@@ -453,11 +453,7 @@ static inline void msgpack_packer_write_symbol_value(msgpack_packer_t* pk, VALUE
 
 static inline void msgpack_packer_write_fixnum_value(msgpack_packer_t* pk, VALUE v)
 {
-#ifdef JRUBY
-    msgpack_packer_write_long(pk, FIXNUM_P(v) ? FIX2LONG(v) : rb_num2ll(v));
-#else
     msgpack_packer_write_long(pk, FIX2LONG(v));
-#endif
 }
 
 static inline void msgpack_packer_write_bignum_value(msgpack_packer_t* pk, VALUE v)
diff --git a/ext/msgpack/unpacker_class.c b/ext/msgpack/unpacker_class.c
@@ -284,12 +284,6 @@ static VALUE Unpacker_each_impl(VALUE self)
             raise_unpacker_error(uk, r);
         }
         VALUE v = msgpack_unpacker_get_last_object(uk);
-#ifdef JRUBY
-        /* TODO JRuby's rb_yield behaves differently from Ruby 1.9.3 or Rubinius. */
-        if(rb_type(v) == T_ARRAY) {
-            v = rb_ary_new3(1, v);
-        }
-#endif
         rb_yield(v);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -453,11 +453,7 @@ static inline void msgpack_packer_write_symbol_value(msgpack_packer_t* pk, VALUE`
`453`	`453`
`454`	`454`	`static inline void msgpack_packer_write_fixnum_value(msgpack_packer_t* pk, VALUE v)`
`455`	`455`	`{`
`456`		`-#ifdef JRUBY`
`457`		`- msgpack_packer_write_long(pk, FIXNUM_P(v) ? FIX2LONG(v) : rb_num2ll(v));`
`458`		`-#else`
`459`	`456`	`msgpack_packer_write_long(pk, FIX2LONG(v));`
`460`		`-#endif`
`461`	`457`	`}`
`462`	`458`
`463`	`459`	`static inline void msgpack_packer_write_bignum_value(msgpack_packer_t* pk, VALUE v)`
Original file line number	Diff line number	Diff line change
`@@ -284,12 +284,6 @@ static VALUE Unpacker_each_impl(VALUE self)`
`284`	`284`	`raise_unpacker_error(uk, r);`
`285`	`285`	`}`
`286`	`286`	`VALUE v = msgpack_unpacker_get_last_object(uk);`
`287`		`-#ifdef JRUBY`
`288`		`- /* TODO JRuby's rb_yield behaves differently from Ruby 1.9.3 or Rubinius. */`
`289`		`- if(rb_type(v) == T_ARRAY) {`
`290`		`- v = rb_ary_new3(1, v);`
`291`		`- }`
`292`		`-#endif`
`293`	`287`	`rb_yield(v);`
`294`	`288`	`}`
`295`	`289`	`}`