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

patch 8.1.0236: Ruby build fails when ruby_intern is missing

Browse Source 
Problem:    Ruby build fails when ruby_intern is missing.
Solution:   Do not use ruby_intern2. (Ken Takata)
This commit is contained in:
Bram Moolenaar
2018-08-03 22:03:17 +02:00
parent 3bf5e6a4c8
commit 82593c1a3a
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/if_ruby.c
View File

@@ -253,11 +253,12 @@ static void ruby_vim_init(void);
# define rb_hash_new dll_rb_hash_new # define rb_hash_new dll_rb_hash_new
# define rb_inspect dll_rb_inspect # define rb_inspect dll_rb_inspect
# define rb_int2inum dll_rb_int2inum # define rb_int2inum dll_rb_int2inum
# ifdef RUBY19_OR_LATER # ifndef rb_intern
# define rb_intern2 dll_rb_intern2
# else
# define rb_intern dll_rb_intern # define rb_intern dll_rb_intern
# endif # endif
# ifdef RUBY_CONST_ID_CACHE
# define rb_intern2 dll_rb_intern2
# endif
# if VIM_SIZEOF_INT < VIM_SIZEOF_LONG /* 64 bits only */ # if VIM_SIZEOF_INT < VIM_SIZEOF_LONG /* 64 bits only */
# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER <= 18 # if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER <= 18
# define rb_fix2int dll_rb_fix2int # define rb_fix2int dll_rb_fix2int
@@ -392,10 +393,9 @@ static VALUE (*dll_rb_hash_aset) (VALUE, VALUE, VALUE);
static VALUE (*dll_rb_hash_new) (void); static VALUE (*dll_rb_hash_new) (void);
static VALUE (*dll_rb_inspect) (VALUE); static VALUE (*dll_rb_inspect) (VALUE);
static VALUE (*dll_rb_int2inum) (long); static VALUE (*dll_rb_int2inum) (long);
# ifdef RUBY19_OR_LATER
static ID (*dll_rb_intern2) (const char*, long);
# else
static ID (*dll_rb_intern) (const char*); static ID (*dll_rb_intern) (const char*);
# ifdef RUBY_CONST_ID_CACHE
static ID (*dll_rb_intern2) (const char*, long);
# endif # endif
# if VIM_SIZEOF_INT < VIM_SIZEOF_LONG /* 64 bits only */ # if VIM_SIZEOF_INT < VIM_SIZEOF_LONG /* 64 bits only */
static long (*dll_rb_fix2int) (VALUE); static long (*dll_rb_fix2int) (VALUE);
@@ -596,10 +596,9 @@ static struct
{"rb_hash_new", (RUBY_PROC*)&dll_rb_hash_new}, {"rb_hash_new", (RUBY_PROC*)&dll_rb_hash_new},
{"rb_inspect", (RUBY_PROC*)&dll_rb_inspect}, {"rb_inspect", (RUBY_PROC*)&dll_rb_inspect},
{"rb_int2inum", (RUBY_PROC*)&dll_rb_int2inum}, {"rb_int2inum", (RUBY_PROC*)&dll_rb_int2inum},
# ifdef RUBY19_OR_LATER
{"rb_intern2", (RUBY_PROC*)&dll_rb_intern2},
# else
{"rb_intern", (RUBY_PROC*)&dll_rb_intern}, {"rb_intern", (RUBY_PROC*)&dll_rb_intern},
# ifdef RUBY_CONST_ID_CACHE
{"rb_intern2", (RUBY_PROC*)&dll_rb_intern2},
# endif # endif
# if VIM_SIZEOF_INT < VIM_SIZEOF_LONG /* 64 bits only */ # if VIM_SIZEOF_INT < VIM_SIZEOF_LONG /* 64 bits only */
{"rb_fix2int", (RUBY_PROC*)&dll_rb_fix2int}, {"rb_fix2int", (RUBY_PROC*)&dll_rb_fix2int},

2
src/version.c
View File

@@ -794,6 +794,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 */
/**/
236,
/**/ /**/
235, 235,
/**/ /**/