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