58 lines
1.9 KiB
Diff
58 lines
1.9 KiB
Diff
From 9d20daffc296b9eb901fb14bdd83620ea55d440a Mon Sep 17 00:00:00 2001
|
|
From: Bram Moolenaar <Bram@vim.org>
|
|
Date: Mon, 1 Feb 2021 19:31:47 +0100
|
|
Subject: [PATCH] patch 8.2.2448: compilation error with Ruby 3.0
|
|
|
|
Problem: Compilation error with Ruby 3.0.
|
|
Solution: Adjust #ifdefs and declaration. (Ken Takata, closes #7761)
|
|
---
|
|
src/if_ruby.c | 10 +++++++---
|
|
1 file changed, 7 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/if_ruby.c b/src/if_ruby.c
|
|
index d21a655..6522d07 100644
|
|
--- a/src/if_ruby.c
|
|
+++ b/src/if_ruby.c
|
|
@@ -416,7 +416,7 @@ static VALUE (*dll_rb_hash_new) (void);
|
|
static VALUE (*dll_rb_inspect) (VALUE);
|
|
static VALUE (*dll_rb_int2inum) (long);
|
|
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_num2int) (VALUE);
|
|
static unsigned long (*dll_rb_num2uint) (VALUE);
|
|
@@ -504,7 +504,11 @@ static void (*dll_rb_gc_writebarrier_unprotect)(VALUE obj);
|
|
# endif
|
|
|
|
# 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));
|
|
+# endif
|
|
# endif
|
|
|
|
# if RUBY_VERSION >= 26
|
|
@@ -534,7 +538,7 @@ rb_int2big_stub(SIGNED_VALUE x)
|
|
{
|
|
return dll_rb_int2big(x);
|
|
}
|
|
-# if VIM_SIZEOF_INT < VIM_SIZEOF_LONG
|
|
+# if RUBY_VERSION >= 30 || VIM_SIZEOF_INT < VIM_SIZEOF_LONG
|
|
long
|
|
rb_fix2int_stub(VALUE x)
|
|
{
|
|
@@ -673,7 +677,7 @@ static struct
|
|
{"rb_inspect", (RUBY_PROC*)&dll_rb_inspect},
|
|
{"rb_int2inum", (RUBY_PROC*)&dll_rb_int2inum},
|
|
{"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_num2int", (RUBY_PROC*)&dll_rb_num2int},
|
|
{"rb_num2uint", (RUBY_PROC*)&dll_rb_num2uint},
|
|
--
|
|
2.13.7
|
|
|