thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.1922

Browse Source 
Problem:    Ruby 2.4.0 unifies Fixnum and Bignum into Integer.
Solution:   Use rb_cInteger. (Weiong Mao)
This commit is contained in:
Bram Moolenaar
2016-06-11 22:26:53 +02:00
parent 724f2edf75
commit 06469e979f
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/if_ruby.c
View File

@@ -31,6 +31,10 @@
# define RUBYEXTERN extern # define RUBYEXTERN extern
#endif #endif
# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 24
# define USE_RUBY_Integer
#endif
#ifdef DYNAMIC_RUBY #ifdef DYNAMIC_RUBY
/* /*
* This is tricky. In ruby.h there is (inline) function rb_class_of() * This is tricky. In ruby.h there is (inline) function rb_class_of()
@@ -39,6 +43,9 @@
*/ */
# define rb_cFalseClass (*dll_rb_cFalseClass) # define rb_cFalseClass (*dll_rb_cFalseClass)
# define rb_cFixnum (*dll_rb_cFixnum) # define rb_cFixnum (*dll_rb_cFixnum)
# if defined(USE_RUBY_Integer)
# define rb_cInteger (*dll_rb_cInteger)
# endif
# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 20 # if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 20
# define rb_cFloat (*dll_rb_cFloat) # define rb_cFloat (*dll_rb_cFloat)
# endif # endif
@@ -318,6 +325,9 @@ static void ruby_vim_init(void);
static VALUE (*dll_rb_assoc_new) (VALUE, VALUE); static VALUE (*dll_rb_assoc_new) (VALUE, VALUE);
VALUE *dll_rb_cFalseClass; VALUE *dll_rb_cFalseClass;
VALUE *dll_rb_cFixnum; VALUE *dll_rb_cFixnum;
# if defined(USE_RUBY_Integer)
VALUE *dll_rb_cInteger;
# endif
# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 20 # if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 20
VALUE *dll_rb_cFloat; VALUE *dll_rb_cFloat;
# endif # endif
@@ -505,6 +515,9 @@ static struct
{"rb_assoc_new", (RUBY_PROC*)&dll_rb_assoc_new}, {"rb_assoc_new", (RUBY_PROC*)&dll_rb_assoc_new},
{"rb_cFalseClass", (RUBY_PROC*)&dll_rb_cFalseClass}, {"rb_cFalseClass", (RUBY_PROC*)&dll_rb_cFalseClass},
{"rb_cFixnum", (RUBY_PROC*)&dll_rb_cFixnum}, {"rb_cFixnum", (RUBY_PROC*)&dll_rb_cFixnum},
# if defined(USE_RUBY_Integer)
{"rb_cInteger", (RUBY_PROC*)&dll_rb_cInteger},
# endif
# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 20 # if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 20
{"rb_cFloat", (RUBY_PROC*)&dll_rb_cFloat}, {"rb_cFloat", (RUBY_PROC*)&dll_rb_cFloat},
# endif # endif

2
src/version.c
View File

@@ -753,6 +753,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 */
/**/
1922,
/**/ /**/
1921, 1921,
/**/ /**/