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.0646: cannot build with Ruby 2.6.0

Browse Source 
Problem:    Cannot build with Ruby 2.6.0.
Solution:   Add rb_ary_detransient(). (Ozaki Kiichi, closes #3724)
This commit is contained in:
Bram Moolenaar
2018-12-27 22:11:01 +01:00
parent 06d6260323
commit b09c684195
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/if_ruby.c
View File

@@ -123,6 +123,10 @@
# define rb_gc_writebarrier_unprotect rb_gc_writebarrier_unprotect_stub # define rb_gc_writebarrier_unprotect rb_gc_writebarrier_unprotect_stub
#endif #endif
#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 26
# define rb_ary_detransient (*dll_rb_ary_detransient)
#endif
#include <ruby.h> #include <ruby.h>
#ifdef RUBY19_OR_LATER #ifdef RUBY19_OR_LATER
# include <ruby/encoding.h> # include <ruby/encoding.h>
@@ -455,6 +459,9 @@ static VALUE (*dll_rb_float_new) (double);
static VALUE (*dll_rb_ary_new) (void); static VALUE (*dll_rb_ary_new) (void);
static VALUE (*dll_rb_ary_new4) (long n, const VALUE *elts); static VALUE (*dll_rb_ary_new4) (long n, const VALUE *elts);
static VALUE (*dll_rb_ary_push) (VALUE, VALUE); static VALUE (*dll_rb_ary_push) (VALUE, VALUE);
# if DYNAMIC_RUBY_VER >= 26
static void (*dll_rb_ary_detransient) (VALUE);
# endif
# if defined(RUBY19_OR_LATER) || defined(RUBY_INIT_STACK) # if defined(RUBY19_OR_LATER) || defined(RUBY_INIT_STACK)
# ifdef __ia64 # ifdef __ia64
static void * (*dll_rb_ia64_bsp) (void); static void * (*dll_rb_ia64_bsp) (void);
@@ -666,6 +673,9 @@ static struct
{"rb_ary_new4", (RUBY_PROC*)&dll_rb_ary_new4}, {"rb_ary_new4", (RUBY_PROC*)&dll_rb_ary_new4},
# endif # endif
{"rb_ary_push", (RUBY_PROC*)&dll_rb_ary_push}, {"rb_ary_push", (RUBY_PROC*)&dll_rb_ary_push},
# if DYNAMIC_RUBY_VER >= 26
{"rb_ary_detransient", (RUBY_PROC*)&dll_rb_ary_detransient},
# endif
# endif # endif
# ifdef RUBY19_OR_LATER # ifdef RUBY19_OR_LATER
{"rb_int2big", (RUBY_PROC*)&dll_rb_int2big}, {"rb_int2big", (RUBY_PROC*)&dll_rb_int2big},
@@ -966,11 +976,8 @@ static int ensure_ruby_initialized(void)
static void error_print(int state) static void error_print(int state)
{ {
#ifndef DYNAMIC_RUBY #if !defined(DYNAMIC_RUBY) && !defined(RUBY19_OR_LATER)
#if !(defined(RUBY_VERSION) && RUBY_VERSION >= 19) \
&& !(defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19)
RUBYEXTERN VALUE ruby_errinfo; RUBYEXTERN VALUE ruby_errinfo;
#endif
#endif #endif
VALUE error; VALUE error;
VALUE eclass; VALUE eclass;

2
src/version.c
View File

@@ -799,6 +799,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 */
/**/
646,
/**/ /**/
645, 645,
/**/ /**/