0
0
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00

patch 7.4.705

Problem:    Can't build with Ruby 2.2.
Solution:   Add #ifdefs to handle the incompatible change. (Andrei Olsen)
This commit is contained in:
Bram Moolenaar
2015-04-21 15:25:31 +02:00
parent d82a2a990b
commit bbc1a592a0
2 changed files with 10 additions and 0 deletions

View File

@@ -396,7 +396,11 @@ static void (*dll_rb_gc_writebarrier_unprotect)(VALUE obj);
# endif # endif
# if defined(RUBY19_OR_LATER) && !defined(PROTO) # 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) SIGNED_VALUE rb_num2long_stub(VALUE x)
# endif
{ {
return dll_rb_num2long(x); return dll_rb_num2long(x);
} }
@@ -421,7 +425,11 @@ rb_float_new_in_heap(double d)
{ {
return dll_rb_float_new(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) VALUE rb_num2ulong(VALUE x)
# endif
{ {
return (long)RSHIFT((SIGNED_VALUE)(x),1); return (long)RSHIFT((SIGNED_VALUE)(x),1);
} }

View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
705,
/**/ /**/
704, 704,
/**/ /**/