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.2.2448: compilation error with Ruby 3.0

Browse Source 
Problem:    Compilation error with Ruby 3.0.
Solution:   Adjust #ifdefs and declaration. (Ken Takata, closes #7761)
This commit is contained in:
Bram Moolenaar
2021-02-01 19:31:47 +01:00
parent f9547eb6ef
commit 9d20daffc2
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/if_ruby.c
View File

@@ -436,7 +436,7 @@ 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);
static ID (*dll_rb_intern) (const char*); static ID (*dll_rb_intern) (const char*);
# if VIM_SIZEOF_INT < VIM_SIZEOF_LONG // 64 bits only # if RUBY_VERSION >= 30 || VIM_SIZEOF_INT < VIM_SIZEOF_LONG
static long (*dll_rb_fix2int) (VALUE); static long (*dll_rb_fix2int) (VALUE);
static long (*dll_rb_num2int) (VALUE); static long (*dll_rb_num2int) (VALUE);
static unsigned long (*dll_rb_num2uint) (VALUE); static unsigned long (*dll_rb_num2uint) (VALUE);
@@ -524,8 +524,12 @@ static void (*dll_rb_gc_writebarrier_unprotect)(VALUE obj);
# endif # endif
# if RUBY_VERSION >= 30 # if RUBY_VERSION >= 30
# ifdef _MSC_VER
static void (*dll_ruby_malloc_size_overflow)(size_t, size_t);
# else
NORETURN(static void (*dll_ruby_malloc_size_overflow)(size_t, size_t)); NORETURN(static void (*dll_ruby_malloc_size_overflow)(size_t, size_t));
# endif # endif
# endif
# if RUBY_VERSION >= 26 # if RUBY_VERSION >= 26
void rb_ary_detransient_stub(VALUE x); void rb_ary_detransient_stub(VALUE x);
@@ -554,7 +558,7 @@ rb_int2big_stub(SIGNED_VALUE x)
{ {
return dll_rb_int2big(x); return dll_rb_int2big(x);
} }
# if VIM_SIZEOF_INT < VIM_SIZEOF_LONG # if RUBY_VERSION >= 30 || VIM_SIZEOF_INT < VIM_SIZEOF_LONG
long long
rb_fix2int_stub(VALUE x) rb_fix2int_stub(VALUE x)
{ {
@@ -612,13 +616,11 @@ rb_check_type_stub(VALUE obj, int t)
{ {
dll_rb_check_type(obj, t); dll_rb_check_type(obj, t);
} }
# if VIM_SIZEOF_INT < VIM_SIZEOF_LONG // 64 bits only
unsigned long unsigned long
rb_num2uint_stub(VALUE x) rb_num2uint_stub(VALUE x)
{ {
return dll_rb_num2uint(x); return dll_rb_num2uint(x);
} }
# endif
void void
ruby_malloc_size_overflow_stub(size_t x, size_t y) ruby_malloc_size_overflow_stub(size_t x, size_t y)
{ {
@@ -695,7 +697,7 @@ static struct
{"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},
{"rb_intern", (RUBY_PROC*)&dll_rb_intern}, {"rb_intern", (RUBY_PROC*)&dll_rb_intern},
# if VIM_SIZEOF_INT < VIM_SIZEOF_LONG // 64 bits only # if RUBY_VERSION >= 30 || VIM_SIZEOF_INT < VIM_SIZEOF_LONG
{"rb_fix2int", (RUBY_PROC*)&dll_rb_fix2int}, {"rb_fix2int", (RUBY_PROC*)&dll_rb_fix2int},
{"rb_num2int", (RUBY_PROC*)&dll_rb_num2int}, {"rb_num2int", (RUBY_PROC*)&dll_rb_num2int},
{"rb_num2uint", (RUBY_PROC*)&dll_rb_num2uint}, {"rb_num2uint", (RUBY_PROC*)&dll_rb_num2uint},

2
src/version.c
View File

@@ -750,6 +750,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 */
/**/
2448,
/**/ /**/
2447, 2447,
/**/ /**/