Skip to content

Commit 4f39179

Browse files
committed
patch 8.0.0191: can't build with Ruby on some systems
Problem: Some systems do not have ruby_sysinit(), causing the build to fail. Solution: Clean up how ruby_sysinit() and NtInitialize() are used. (Taro Muraoka)
1 parent 810f9c3 commit 4f39179

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

src/if_ruby.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,7 @@ static void ruby_vim_init(void);
303303
# define ruby_init_loadpath dll_ruby_init_loadpath
304304
# ifdef WIN3264
305305
# define NtInitialize dll_NtInitialize
306+
# define ruby_sysinit dll_ruby_sysinit
306307
# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
307308
# define rb_w32_snprintf dll_rb_w32_snprintf
308309
# endif
@@ -405,6 +406,7 @@ static void (*dll_ruby_init) (void);
405406
static void (*dll_ruby_init_loadpath) (void);
406407
# ifdef WIN3264
407408
static void (*dll_NtInitialize) (int*, char***);
409+
static void (*dll_ruby_sysinit) (int*, char***);
408410
# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
409411
static int (*dll_rb_w32_snprintf)(char*, size_t, const char*, ...);
410412
# endif
@@ -594,13 +596,11 @@ static struct
594596
{"ruby_init", (RUBY_PROC*)&dll_ruby_init},
595597
{"ruby_init_loadpath", (RUBY_PROC*)&dll_ruby_init_loadpath},
596598
# ifdef WIN3264
597-
{
598599
# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER < 19
599-
"NtInitialize",
600+
{"NtInitialize", (RUBY_PROC*)&dll_NtInitialize},
600601
# else
601-
"ruby_sysinit",
602+
{"ruby_sysinit", (RUBY_PROC*)&dll_ruby_sysinit},
602603
# endif
603-
(RUBY_PROC*)&dll_NtInitialize},
604604
# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
605605
{"rb_w32_snprintf", (RUBY_PROC*)&dll_rb_w32_snprintf},
606606
# endif

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,8 @@ static char *(features[]) =
764764

765765
static int included_patches[] =
766766
{ /* Add new patch number below this line */
767+
/**/
768+
191,
767769
/**/
768770
190,
769771
/**/

0 commit comments

Comments
 (0)