3ef2ca
To: vim_dev@googlegroups.com
3ef2ca
Subject: Patch 7.4.225
3ef2ca
Fcc: outbox
3ef2ca
From: Bram Moolenaar <Bram@moolenaar.net>
3ef2ca
Mime-Version: 1.0
3ef2ca
Content-Type: text/plain; charset=UTF-8
3ef2ca
Content-Transfer-Encoding: 8bit
3ef2ca
------------
3ef2ca
3ef2ca
Patch 7.4.225
3ef2ca
Problem:    Dynamic Ruby doesn't work on Solaris.
3ef2ca
Solution:   Always use the stubs. (Danek Duvall, Yukihiro Nakadaira)
3ef2ca
Files:	    src/if_ruby.c
3ef2ca
3ef2ca
3ef2ca
*** ../vim-7.4.224/src/if_ruby.c	2014-02-23 22:52:33.352764716 +0100
3ef2ca
--- src/if_ruby.c	2014-03-27 18:56:37.428765988 +0100
3ef2ca
***************
3ef2ca
*** 88,95 ****
3ef2ca
  # define rb_int2big rb_int2big_stub
3ef2ca
  #endif
3ef2ca
  
3ef2ca
! #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 20 \
3ef2ca
! 	&& VIM_SIZEOF_INT < VIM_SIZEOF_LONG
3ef2ca
  /* Ruby 2.0 defines a number of static functions which use rb_fix2int and
3ef2ca
   * rb_num2int if VIM_SIZEOF_INT < VIM_SIZEOF_LONG (64bit) */
3ef2ca
  # define rb_fix2int rb_fix2int_stub
3ef2ca
--- 88,94 ----
3ef2ca
  # define rb_int2big rb_int2big_stub
3ef2ca
  #endif
3ef2ca
  
3ef2ca
! #if defined(DYNAMIC_RUBY_VER) && VIM_SIZEOF_INT < VIM_SIZEOF_LONG
3ef2ca
  /* Ruby 2.0 defines a number of static functions which use rb_fix2int and
3ef2ca
   * rb_num2int if VIM_SIZEOF_INT < VIM_SIZEOF_LONG (64bit) */
3ef2ca
  # define rb_fix2int rb_fix2int_stub
3ef2ca
***************
3ef2ca
*** 203,210 ****
3ef2ca
  # define rb_inspect			dll_rb_inspect
3ef2ca
  # define rb_int2inum			dll_rb_int2inum
3ef2ca
  # if VIM_SIZEOF_INT < VIM_SIZEOF_LONG /* 64 bits only */
3ef2ca
- #  define rb_fix2int			dll_rb_fix2int
3ef2ca
- #  define rb_num2int			dll_rb_num2int
3ef2ca
  #  define rb_num2uint			dll_rb_num2uint
3ef2ca
  # endif
3ef2ca
  # define rb_lastline_get			dll_rb_lastline_get
3ef2ca
--- 202,207 ----
3ef2ca
***************
3ef2ca
*** 392,399 ****
3ef2ca
  {
3ef2ca
      return dll_rb_int2big(x);
3ef2ca
  }
3ef2ca
! #  if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 20 \
3ef2ca
! 	&& VIM_SIZEOF_INT < VIM_SIZEOF_LONG
3ef2ca
  long rb_fix2int_stub(VALUE x)
3ef2ca
  {
3ef2ca
      return dll_rb_fix2int(x);
3ef2ca
--- 389,395 ----
3ef2ca
  {
3ef2ca
      return dll_rb_int2big(x);
3ef2ca
  }
3ef2ca
! #  if defined(DYNAMIC_RUBY_VER) && VIM_SIZEOF_INT < VIM_SIZEOF_LONG
3ef2ca
  long rb_fix2int_stub(VALUE x)
3ef2ca
  {
3ef2ca
      return dll_rb_fix2int(x);
3ef2ca
*** ../vim-7.4.224/src/version.c	2014-03-27 18:51:06.612760919 +0100
3ef2ca
--- src/version.c	2014-03-27 18:55:21.412764824 +0100
3ef2ca
***************
3ef2ca
*** 736,737 ****
3ef2ca
--- 736,739 ----
3ef2ca
  {   /* Add new patch number below this line */
3ef2ca
+ /**/
3ef2ca
+     225,
3ef2ca
  /**/
3ef2ca
3ef2ca
-- 
3ef2ca
Engineers are widely recognized as superior marriage material: intelligent,
3ef2ca
dependable, employed, honest, and handy around the house.
3ef2ca
				(Scott Adams - The Dilbert principle)
3ef2ca
3ef2ca
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
3ef2ca
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
3ef2ca
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
3ef2ca
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///