diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-03-27 19:08:55 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-03-27 19:08:55 +0100 |
| commit | 73b044dca94c8d427144b920c12fe5c47007a6f6 (patch) | |
| tree | fa7223197c096346fefd81ec18fb6f2990562194 | |
| parent | 2bcaec320aff11e777618e5b8c112aa15ec6ca21 (diff) | |
| download | vim-73b044dca94c8d427144b920c12fe5c47007a6f6.zip | |
updated for version 7.4.225
Problem: Dynamic Ruby doesn't work on Solaris.
Solution: Always use the stubs. (Danek Duvall, Yukihiro Nakadaira)
| -rw-r--r-- | src/if_ruby.c | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/if_ruby.c b/src/if_ruby.c index 0fa774b1a..d8c14c652 100644 --- a/src/if_ruby.c +++ b/src/if_ruby.c @@ -88,8 +88,7 @@ # define rb_int2big rb_int2big_stub #endif -#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 20 \ - && VIM_SIZEOF_INT < VIM_SIZEOF_LONG +#if defined(DYNAMIC_RUBY_VER) && VIM_SIZEOF_INT < VIM_SIZEOF_LONG /* Ruby 2.0 defines a number of static functions which use rb_fix2int and * rb_num2int if VIM_SIZEOF_INT < VIM_SIZEOF_LONG (64bit) */ # define rb_fix2int rb_fix2int_stub @@ -203,8 +202,6 @@ static void ruby_vim_init(void); # define rb_inspect dll_rb_inspect # define rb_int2inum dll_rb_int2inum # 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 # endif # define rb_lastline_get dll_rb_lastline_get @@ -392,8 +389,7 @@ VALUE rb_int2big_stub(SIGNED_VALUE x) { return dll_rb_int2big(x); } -# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 20 \ - && VIM_SIZEOF_INT < VIM_SIZEOF_LONG +# if defined(DYNAMIC_RUBY_VER) && VIM_SIZEOF_INT < VIM_SIZEOF_LONG long rb_fix2int_stub(VALUE x) { return dll_rb_fix2int(x); diff --git a/src/version.c b/src/version.c index b1bfd659b..188ad745c 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 225, +/**/ 224, /**/ 223, |