0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

updated for version 7.4.225

Problem:    Dynamic Ruby doesn't work on Solaris.
Solution:   Always use the stubs. (Danek Duvall, Yukihiro Nakadaira)
This commit is contained in:
Bram Moolenaar
2014-03-27 19:08:55 +01:00
parent 2bcaec320a
commit 73b044dca9
2 changed files with 4 additions and 6 deletions

View File

@@ -88,8 +88,7 @@
# define rb_int2big rb_int2big_stub # define rb_int2big rb_int2big_stub
#endif #endif
#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 20 \ #if defined(DYNAMIC_RUBY_VER) && VIM_SIZEOF_INT < VIM_SIZEOF_LONG
&& VIM_SIZEOF_INT < VIM_SIZEOF_LONG
/* Ruby 2.0 defines a number of static functions which use rb_fix2int and /* Ruby 2.0 defines a number of static functions which use rb_fix2int and
* rb_num2int if VIM_SIZEOF_INT < VIM_SIZEOF_LONG (64bit) */ * rb_num2int if VIM_SIZEOF_INT < VIM_SIZEOF_LONG (64bit) */
# define rb_fix2int rb_fix2int_stub # define rb_fix2int rb_fix2int_stub
@@ -203,8 +202,6 @@ static void ruby_vim_init(void);
# define rb_inspect dll_rb_inspect # define rb_inspect dll_rb_inspect
# define rb_int2inum dll_rb_int2inum # define rb_int2inum dll_rb_int2inum
# if VIM_SIZEOF_INT < VIM_SIZEOF_LONG /* 64 bits only */ # if VIM_SIZEOF_INT < VIM_SIZEOF_LONG /* 64 bits only */
# define rb_fix2int dll_rb_fix2int
# define rb_num2int dll_rb_num2int
# define rb_num2uint dll_rb_num2uint # define rb_num2uint dll_rb_num2uint
# endif # endif
# define rb_lastline_get dll_rb_lastline_get # define rb_lastline_get dll_rb_lastline_get
@@ -392,8 +389,7 @@ VALUE rb_int2big_stub(SIGNED_VALUE x)
{ {
return dll_rb_int2big(x); return dll_rb_int2big(x);
} }
# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 20 \ # if defined(DYNAMIC_RUBY_VER) && VIM_SIZEOF_INT < VIM_SIZEOF_LONG
&& VIM_SIZEOF_INT < VIM_SIZEOF_LONG
long rb_fix2int_stub(VALUE x) long rb_fix2int_stub(VALUE x)
{ {
return dll_rb_fix2int(x); return dll_rb_fix2int(x);

View File

@@ -734,6 +734,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 */
/**/
225,
/**/ /**/
224, 224,
/**/ /**/