|
 |
19175ab |
To: vim_dev@googlegroups.com
|
|
|
19175ab |
Subject: Patch 7.3.935
|
|
|
19175ab |
Fcc: outbox
|
|
|
19175ab |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
19175ab |
Mime-Version: 1.0
|
|
|
19175ab |
Content-Type: text/plain; charset=UTF-8
|
|
|
19175ab |
Content-Transfer-Encoding: 8bit
|
|
|
19175ab |
------------
|
|
|
19175ab |
|
|
|
19175ab |
Patch 7.3.935 (after 7.3.933)
|
|
|
19175ab |
Problem: Init stack works differently on 64 bit systems.
|
|
|
19175ab |
Solution: Handle 64 bit systems and also static library. (Yukihiro
|
|
|
19175ab |
Nakadaira)
|
|
|
19175ab |
Files: src/if_ruby.c
|
|
|
19175ab |
|
|
|
19175ab |
|
|
|
19175ab |
*** ../vim-7.3.934/src/if_ruby.c 2013-05-11 13:56:12.000000000 +0200
|
|
|
19175ab |
--- src/if_ruby.c 2013-05-11 17:31:55.000000000 +0200
|
|
|
19175ab |
***************
|
|
|
19175ab |
*** 227,233 ****
|
|
|
19175ab |
# define rb_float_new dll_rb_float_new
|
|
|
19175ab |
# define rb_ary_new dll_rb_ary_new
|
|
|
19175ab |
# define rb_ary_push dll_rb_ary_push
|
|
|
19175ab |
! # define ruby_init_stack dll_ruby_init_stack
|
|
|
19175ab |
#else
|
|
|
19175ab |
# define rb_str2cstr dll_rb_str2cstr
|
|
|
19175ab |
#endif
|
|
|
19175ab |
--- 227,239 ----
|
|
|
19175ab |
# define rb_float_new dll_rb_float_new
|
|
|
19175ab |
# define rb_ary_new dll_rb_ary_new
|
|
|
19175ab |
# define rb_ary_push dll_rb_ary_push
|
|
|
19175ab |
! # ifdef __ia64
|
|
|
19175ab |
! # define rb_ia64_bsp dll_rb_ia64_bsp
|
|
|
19175ab |
! # undef ruby_init_stack
|
|
|
19175ab |
! # define ruby_init_stack(addr) dll_ruby_init_stack((addr), rb_ia64_bsp())
|
|
|
19175ab |
! # else
|
|
|
19175ab |
! # define ruby_init_stack dll_ruby_init_stack
|
|
|
19175ab |
! # endif
|
|
|
19175ab |
#else
|
|
|
19175ab |
# define rb_str2cstr dll_rb_str2cstr
|
|
|
19175ab |
#endif
|
|
|
19175ab |
***************
|
|
|
19175ab |
*** 336,342 ****
|
|
|
19175ab |
static VALUE (*dll_rb_float_new) (double);
|
|
|
19175ab |
static VALUE (*dll_rb_ary_new) (void);
|
|
|
19175ab |
static VALUE (*dll_rb_ary_push) (VALUE, VALUE);
|
|
|
19175ab |
! static void (*ruby_init_stack)(VALUE*);
|
|
|
19175ab |
#endif
|
|
|
19175ab |
#ifdef RUBY19_OR_LATER
|
|
|
19175ab |
static VALUE (*dll_rb_int2big)(SIGNED_VALUE);
|
|
|
19175ab |
--- 342,353 ----
|
|
|
19175ab |
static VALUE (*dll_rb_float_new) (double);
|
|
|
19175ab |
static VALUE (*dll_rb_ary_new) (void);
|
|
|
19175ab |
static VALUE (*dll_rb_ary_push) (VALUE, VALUE);
|
|
|
19175ab |
! # ifdef __ia64
|
|
|
19175ab |
! static void * (*dll_rb_ia64_bsp) (void);
|
|
|
19175ab |
! static void (*dll_ruby_init_stack)(VALUE*, void*);
|
|
|
19175ab |
! # else
|
|
|
19175ab |
! static void (*dll_ruby_init_stack)(VALUE*);
|
|
|
19175ab |
! # endif
|
|
|
19175ab |
#endif
|
|
|
19175ab |
#ifdef RUBY19_OR_LATER
|
|
|
19175ab |
static VALUE (*dll_rb_int2big)(SIGNED_VALUE);
|
|
|
19175ab |
***************
|
|
|
19175ab |
*** 476,481 ****
|
|
|
19175ab |
--- 487,495 ----
|
|
|
19175ab |
#endif
|
|
|
19175ab |
#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
|
|
|
19175ab |
{"rb_string_value_ptr", (RUBY_PROC*)&dll_rb_string_value_ptr},
|
|
|
19175ab |
+ # ifdef __ia64
|
|
|
19175ab |
+ {"rb_ia64_bsp", (RUBY_PROC*)&dll_rb_ia64_bsp},
|
|
|
19175ab |
+ # endif
|
|
|
19175ab |
{"ruby_init_stack", (RUBY_PROC*)&dll_ruby_init_stack},
|
|
|
19175ab |
# if DYNAMIC_RUBY_VER <= 19
|
|
|
19175ab |
{"rb_float_new", (RUBY_PROC*)&dll_rb_float_new},
|
|
|
19175ab |
***************
|
|
|
19175ab |
*** 717,723 ****
|
|
|
19175ab |
NtInitialize(&argc, &argv);
|
|
|
19175ab |
#endif
|
|
|
19175ab |
{
|
|
|
19175ab |
! #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
|
|
|
19175ab |
ruby_init_stack(ruby_stack_start);
|
|
|
19175ab |
#endif
|
|
|
19175ab |
ruby_init();
|
|
|
19175ab |
--- 731,737 ----
|
|
|
19175ab |
NtInitialize(&argc, &argv);
|
|
|
19175ab |
#endif
|
|
|
19175ab |
{
|
|
|
19175ab |
! #if defined(RUBY_VERSION) && RUBY_VERSION >= 18
|
|
|
19175ab |
ruby_init_stack(ruby_stack_start);
|
|
|
19175ab |
#endif
|
|
|
19175ab |
ruby_init();
|
|
|
19175ab |
*** ../vim-7.3.934/src/version.c 2013-05-11 15:50:02.000000000 +0200
|
|
|
19175ab |
--- src/version.c 2013-05-11 17:39:08.000000000 +0200
|
|
|
19175ab |
***************
|
|
|
19175ab |
*** 730,731 ****
|
|
|
19175ab |
--- 730,733 ----
|
|
|
19175ab |
{ /* Add new patch number below this line */
|
|
|
19175ab |
+ /**/
|
|
|
19175ab |
+ 935,
|
|
|
19175ab |
/**/
|
|
|
19175ab |
|
|
|
19175ab |
--
|
|
|
19175ab |
ARTHUR: Well, it doesn't matter. Will you go and tell your master that
|
|
|
19175ab |
Arthur from the Court of Camelot is here.
|
|
|
19175ab |
GUARD #1: Listen, in order to maintain air-speed velocity, a swallow
|
|
|
19175ab |
needs to beat its wings 43 times every second, right?
|
|
|
19175ab |
ARTHUR: Please!
|
|
|
19175ab |
The Quest for the Holy Grail (Monty Python)
|
|
|
19175ab |
|
|
|
19175ab |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
19175ab |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
19175ab |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
19175ab |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|