diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-04-21 15:25:31 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-04-21 15:25:31 +0200 |
| commit | bbc1a592a0e0efd5101a58032e7e7cc9f3e9f417 (patch) | |
| tree | c7d6e8cebca677f5e748153a752e13d94ded368c | |
| parent | d82a2a990bc329754e1b61c5af669c76ac202497 (diff) | |
patch 7.4.705v7.4.705
Problem: Can't build with Ruby 2.2.
Solution: Add #ifdefs to handle the incompatible change. (Andrei Olsen)
| -rw-r--r-- | src/if_ruby.c | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/if_ruby.c b/src/if_ruby.c index 3b9f476619..3767bf3346 100644 --- a/src/if_ruby.c +++ b/src/if_ruby.c @@ -396,7 +396,11 @@ static void (*dll_rb_gc_writebarrier_unprotect)(VALUE obj); # endif # if defined(RUBY19_OR_LATER) && !defined(PROTO) +# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 22 +long rb_num2long_stub(VALUE x) +# else SIGNED_VALUE rb_num2long_stub(VALUE x) +# endif { return dll_rb_num2long(x); } @@ -421,7 +425,11 @@ rb_float_new_in_heap(double d) { return dll_rb_float_new(d); } +# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 22 +unsigned long rb_num2ulong(VALUE x) +# else VALUE rb_num2ulong(VALUE x) +# endif { return (long)RSHIFT((SIGNED_VALUE)(x),1); } diff --git a/src/version.c b/src/version.c index 11dd808f4e..0b2d6fe1ab 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 705, +/**/ 704, /**/ 703, |