diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-03-28 21:58:21 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-03-28 21:58:21 +0100 |
| commit | 498af70e066c66b66f1737b553287c1339846842 (patch) | |
| tree | 733b755f9824b3946a00a82cb09b8d4350946e30 /src | |
| parent | 3d6db1467b9c3737fcf61e03209f2ffcea5a4bca (diff) | |
| download | vim-498af70e066c66b66f1737b553287c1339846842.zip | |
updated for version 7.4.227
Problem: Can't build with Ruby 1.8.
Solution: Do include a check for the Ruby version. (Ken Takata)
Diffstat (limited to 'src')
| -rw-r--r-- | src/if_ruby.c | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/if_ruby.c b/src/if_ruby.c index d8c14c652..06465bd5a 100644 --- a/src/if_ruby.c +++ b/src/if_ruby.c @@ -88,8 +88,9 @@ # define rb_int2big rb_int2big_stub #endif -#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 +#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19 \ + && VIM_SIZEOF_INT < VIM_SIZEOF_LONG +/* Ruby 1.9 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 # define rb_num2int rb_num2int_stub @@ -202,6 +203,10 @@ 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 */ +# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER <= 18 +# define rb_fix2int dll_rb_fix2int +# define rb_num2int dll_rb_num2int +# endif # define rb_num2uint dll_rb_num2uint # endif # define rb_lastline_get dll_rb_lastline_get @@ -389,7 +394,8 @@ VALUE rb_int2big_stub(SIGNED_VALUE x) { return dll_rb_int2big(x); } -# if defined(DYNAMIC_RUBY_VER) && VIM_SIZEOF_INT < VIM_SIZEOF_LONG +# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19 \ + && 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 06cc7f6a3..1fa43a1d5 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 */ /**/ + 227, +/**/ 226, /**/ 225, |