updated for version 7.3.935

Problem:    Init stack works differently on 64 bit systems.
Solution:   Handle 64 bit systems and also static library. (Yukihiro
            Nakadaira)

diff --git a/src/if_ruby.c b/src/if_ruby.c
index f1752f04711255cf433f81a11e3fdc6d45c1393f..80aedf798d6a1323c78edefce288a778dd5a447f 100644 (file)
--- a/src/if_ruby.c
+++ b/src/if_ruby.c
@@ -227,7 +227,13 @@ static void ruby_vim_init(void);
 # define rb_float_new                  dll_rb_float_new
 # define rb_ary_new                    dll_rb_ary_new
 # define rb_ary_push                   dll_rb_ary_push
-# define ruby_init_stack               dll_ruby_init_stack
+# ifdef __ia64
+#  define rb_ia64_bsp          dll_rb_ia64_bsp
+#  undef ruby_init_stack
+#  define ruby_init_stack(addr)        dll_ruby_init_stack((addr), rb_ia64_bsp())
+# else
+#  define ruby_init_stack      dll_ruby_init_stack
+# endif
 #else
 # define rb_str2cstr                   dll_rb_str2cstr
 #endif
@@ -336,7 +342,12 @@ static char * (*dll_rb_string_value_ptr) (volatile VALUE*);
 static VALUE (*dll_rb_float_new) (double);
 static VALUE (*dll_rb_ary_new) (void);
 static VALUE (*dll_rb_ary_push) (VALUE, VALUE);
-static void (*ruby_init_stack)(VALUE*);
+# ifdef __ia64
+static void * (*dll_rb_ia64_bsp) (void);
+static void (*dll_ruby_init_stack)(VALUE*, void*);
+# else
+static void (*dll_ruby_init_stack)(VALUE*);
+# endif
 #endif
 #ifdef RUBY19_OR_LATER
 static VALUE (*dll_rb_int2big)(SIGNED_VALUE);
@@ -476,6 +487,9 @@ static struct
 #endif
 #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
     {"rb_string_value_ptr", (RUBY_PROC*)&dll_rb_string_value_ptr},
+# ifdef __ia64
+    {"rb_ia64_bsp", (RUBY_PROC*)&dll_rb_ia64_bsp},
+# endif
     {"ruby_init_stack", (RUBY_PROC*)&dll_ruby_init_stack},
 # if DYNAMIC_RUBY_VER <= 19
     {"rb_float_new", (RUBY_PROC*)&dll_rb_float_new},
@@ -717,7 +731,7 @@ static int ensure_ruby_initialized(void)
            NtInitialize(&argc, &argv);
 #endif
            {
-#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
+#if defined(RUBY_VERSION) && RUBY_VERSION >= 18
                ruby_init_stack(ruby_stack_start);
 #endif
                ruby_init();

diff --git a/src/version.c b/src/version.c
index 21b537d57a9001da2bb03f5b989030d453b1f864..362d189cfb131719a498039cdc8cd12482a4b908 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    935,
 /**/
     934,
 /**/