|
 |
3ef2ca |
To: vim_dev@googlegroups.com
|
|
|
3ef2ca |
Subject: Patch 7.4.534
|
|
|
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.534
|
|
|
3ef2ca |
Problem: Warnings when compiling if_ruby.c.
|
|
|
3ef2ca |
Solution: Avoid the warnings. (Ken Takata)
|
|
|
3ef2ca |
Files: src/if_ruby.c
|
|
|
3ef2ca |
|
|
|
3ef2ca |
|
|
|
3ef2ca |
*** ../vim-7.4.533/src/if_ruby.c 2014-11-12 16:05:01.142042845 +0100
|
|
|
3ef2ca |
--- src/if_ruby.c 2014-11-27 17:42:25.205922384 +0100
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 96,106 ****
|
|
|
3ef2ca |
# define rb_num2int rb_num2int_stub
|
|
|
3ef2ca |
#endif
|
|
|
3ef2ca |
|
|
|
3ef2ca |
! # if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 21
|
|
|
3ef2ca |
/* Ruby 2.1 adds new GC called RGenGC and RARRAY_PTR uses
|
|
|
3ef2ca |
* rb_gc_writebarrier_unprotect_promoted if USE_RGENGC */
|
|
|
3ef2ca |
! # define rb_gc_writebarrier_unprotect_promoted rb_gc_writebarrier_unprotect_promoted_stub
|
|
|
3ef2ca |
! # endif
|
|
|
3ef2ca |
|
|
|
3ef2ca |
#include <ruby.h>
|
|
|
3ef2ca |
#ifdef RUBY19_OR_LATER
|
|
|
3ef2ca |
--- 96,106 ----
|
|
|
3ef2ca |
# define rb_num2int rb_num2int_stub
|
|
|
3ef2ca |
#endif
|
|
|
3ef2ca |
|
|
|
3ef2ca |
! #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 21
|
|
|
3ef2ca |
/* Ruby 2.1 adds new GC called RGenGC and RARRAY_PTR uses
|
|
|
3ef2ca |
* rb_gc_writebarrier_unprotect_promoted if USE_RGENGC */
|
|
|
3ef2ca |
! # define rb_gc_writebarrier_unprotect_promoted rb_gc_writebarrier_unprotect_promoted_stub
|
|
|
3ef2ca |
! #endif
|
|
|
3ef2ca |
|
|
|
3ef2ca |
#include <ruby.h>
|
|
|
3ef2ca |
#ifdef RUBY19_OR_LATER
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 422,428 ****
|
|
|
3ef2ca |
# if defined(USE_RGENGC) && USE_RGENGC && !defined(PROTO)
|
|
|
3ef2ca |
void rb_gc_writebarrier_unprotect_promoted_stub(VALUE obj)
|
|
|
3ef2ca |
{
|
|
|
3ef2ca |
! return dll_rb_gc_writebarrier_unprotect_promoted(obj);
|
|
|
3ef2ca |
}
|
|
|
3ef2ca |
# endif
|
|
|
3ef2ca |
|
|
|
3ef2ca |
--- 422,428 ----
|
|
|
3ef2ca |
# if defined(USE_RGENGC) && USE_RGENGC && !defined(PROTO)
|
|
|
3ef2ca |
void rb_gc_writebarrier_unprotect_promoted_stub(VALUE obj)
|
|
|
3ef2ca |
{
|
|
|
3ef2ca |
! dll_rb_gc_writebarrier_unprotect_promoted(obj);
|
|
|
3ef2ca |
}
|
|
|
3ef2ca |
# endif
|
|
|
3ef2ca |
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 763,769 ****
|
|
|
3ef2ca |
/* suggested by Ariya Mizutani */
|
|
|
3ef2ca |
int argc = 1;
|
|
|
3ef2ca |
char *argv[] = {"gvim.exe"};
|
|
|
3ef2ca |
! NtInitialize(&argc, &argv);
|
|
|
3ef2ca |
#endif
|
|
|
3ef2ca |
{
|
|
|
3ef2ca |
#if defined(RUBY19_OR_LATER) || defined(RUBY_INIT_STACK)
|
|
|
3ef2ca |
--- 763,770 ----
|
|
|
3ef2ca |
/* suggested by Ariya Mizutani */
|
|
|
3ef2ca |
int argc = 1;
|
|
|
3ef2ca |
char *argv[] = {"gvim.exe"};
|
|
|
3ef2ca |
! char **argvp = argv;
|
|
|
3ef2ca |
! NtInitialize(&argc, &argvp);
|
|
|
3ef2ca |
#endif
|
|
|
3ef2ca |
{
|
|
|
3ef2ca |
#if defined(RUBY19_OR_LATER) || defined(RUBY_INIT_STACK)
|
|
|
3ef2ca |
*** ../vim-7.4.533/src/version.c 2014-11-27 17:37:53.524909964 +0100
|
|
|
3ef2ca |
--- src/version.c 2014-11-27 17:42:13.626049717 +0100
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 743,744 ****
|
|
|
3ef2ca |
--- 743,746 ----
|
|
|
3ef2ca |
{ /* Add new patch number below this line */
|
|
|
3ef2ca |
+ /**/
|
|
|
3ef2ca |
+ 534,
|
|
|
3ef2ca |
/**/
|
|
|
3ef2ca |
|
|
|
3ef2ca |
--
|
|
|
3ef2ca |
This message contains 78% recycled characters.
|
|
|
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 ///
|