diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-07-22 16:24:08 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-22 16:24:08 -0500 |
| commit | 0710c0f9fc34a50a1234bc9a0e332fcbb9bc1136 (patch) | |
| tree | c7993553af52bc1a13ed594362f4ec058f556599 | |
| parent | 64a800e4a4e1e67c0df43e95ccde08158c926c84 (diff) | |
| parent | 528c607ea75cb02f2bca781c9669ac72159a86bb (diff) | |
| download | ffi-yajl-0710c0f9fc34a50a1234bc9a0e332fcbb9bc1136.tar.gz | |
Merge pull request #80 from chef/ruby-2.4.0
replace Fixnum+Bignum with Integer
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | ext/ffi_yajl/ext/encoder/encoder.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 18c29ee..2ad91f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,8 +26,6 @@ matrix: jdk: oraclejdk8 - rvm: jruby-head jdk: openjdk7 - allow_failures: - - rvm: ruby-head branches: only: diff --git a/ext/ffi_yajl/ext/encoder/encoder.c b/ext/ffi_yajl/ext/encoder/encoder.c index 92f64a9..6f1492c 100644 --- a/ext/ffi_yajl/ext/encoder/encoder.c +++ b/ext/ffi_yajl/ext/encoder/encoder.c @@ -377,8 +377,12 @@ void Init_encoder() { rb_define_method(rb_cNilClass, "ffi_yajl", rb_cNilClass_ffi_yajl, 2); rb_define_method(rb_cTrueClass, "ffi_yajl", rb_cTrueClass_ffi_yajl, 2); rb_define_method(rb_cFalseClass, "ffi_yajl", rb_cFalseClass_ffi_yajl, 2); +#ifdef rb_cFixnum /* ruby < 2.4 */ rb_define_method(rb_cFixnum, "ffi_yajl", rb_cFixnum_ffi_yajl, 2); rb_define_method(rb_cBignum, "ffi_yajl", rb_cBignum_ffi_yajl, 2); +#else + rb_define_method(rb_cInteger, "ffi_yajl", rb_cFixnum_ffi_yajl, 2); +#endif rb_define_method(rb_cFloat, "ffi_yajl", rb_cFloat_ffi_yajl, 2); rb_define_method(rb_cString, "ffi_yajl", rb_cString_ffi_yajl, 2); rb_define_method(rb_cSymbol, "ffi_yajl", rb_cSymbol_ffi_yajl, 2); |