summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-01-14 20:12:01 +0100
committerBram Moolenaar <Bram@vim.org>2017-01-14 20:12:01 +0100
commitfe6ce331d94c24ad745d0bf329ec0a65a5c07cc9 (patch)
tree72878744f4636b564f2a18ad2df791a56384e142
parent5869cf060e60cc09e71b2b3bd85f0576ec78f9f5 (diff)
patch 8.0.0187: cant build with new Ruby versionv8.0.0187
Problem: Building with a new Ruby version fails. Solution: Use ruby_sysinit() instead of NtInitialize(). (Tomas Volf, closes #1382)
-rw-r--r--src/if_ruby.c4
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/if_ruby.c b/src/if_ruby.c
index bc6edc7536..509d2f6cf1 100644
--- a/src/if_ruby.c
+++ b/src/if_ruby.c
@@ -862,7 +862,11 @@ static int ensure_ruby_initialized(void)
int argc = 1;
char *argv[] = {"gvim.exe"};
char **argvp = argv;
+# ifdef RUBY19_OR_LATER
+ ruby_sysinit(&argc, &argvp);
+# else
NtInitialize(&argc, &argvp);
+# endif
#endif
{
#if defined(RUBY19_OR_LATER) || defined(RUBY_INIT_STACK)
diff --git a/src/version.c b/src/version.c
index 6511b36957..814934ded8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 187,
+/**/
186,
/**/
185,