summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-01-08 20:29:32 +0100
committerBram Moolenaar <Bram@vim.org>2019-01-08 20:29:32 +0100
commitf62fc316a212160d1c58be88f30efd11eb595493 (patch)
tree769271e0f7a566dfcfe2738bee46fda050fa0c3b
parent8aef43b66cf280c79a75d81f43ce5223b9044e63 (diff)
downloadvim-git-f62fc316a212160d1c58be88f30efd11eb595493.tar.gz
patch 8.1.0704: building with Ruby 2.6 gives compiler warningsv8.1.0704
Problem: Building with Ruby 2.6 gives compiler warnings. Solution: Define a stub for rb_ary_detransient. (Ozaki Kiichi, closes #3779)
-rw-r--r--src/if_ruby.c9
-rw-r--r--src/version.c2
2 files changed, 10 insertions, 1 deletions
diff --git a/src/if_ruby.c b/src/if_ruby.c
index 34fc0ed1c..c2a2ec3f7 100644
--- a/src/if_ruby.c
+++ b/src/if_ruby.c
@@ -124,7 +124,7 @@
#endif
#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 26
-# define rb_ary_detransient (*dll_rb_ary_detransient)
+# define rb_ary_detransient rb_ary_detransient_stub
#endif
#include <ruby.h>
@@ -549,6 +549,13 @@ void rb_gc_writebarrier_unprotect_stub(VALUE obj)
# endif
# endif
+# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 26
+void rb_ary_detransient_stub(VALUE x)
+{
+ dll_rb_ary_detransient(x);
+}
+# endif
+
static HINSTANCE hinstRuby = NULL; /* Instance of ruby.dll */
/*
diff --git a/src/version.c b/src/version.c
index 0693be11d..95f385902 100644
--- a/src/version.c
+++ b/src/version.c
@@ -800,6 +800,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 704,
+/**/
703,
/**/
702,