thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.4.534

Browse Source 
Problem:    Warnings when compiling if_ruby.c.
Solution:   Avoid the warnings. (Ken Takata)
This commit is contained in:
Bram Moolenaar
2014-11-27 17:44:08 +01:00
parent 0a38396937
commit 9014074913
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/if_ruby.c
View File

@@ -96,11 +96,11 @@
# define rb_num2int rb_num2int_stub # define rb_num2int rb_num2int_stub
#endif #endif
# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 21 #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 21
/* Ruby 2.1 adds new GC called RGenGC and RARRAY_PTR uses /* Ruby 2.1 adds new GC called RGenGC and RARRAY_PTR uses
* rb_gc_writebarrier_unprotect_promoted if USE_RGENGC */ * rb_gc_writebarrier_unprotect_promoted if USE_RGENGC */
# define rb_gc_writebarrier_unprotect_promoted rb_gc_writebarrier_unprotect_promoted_stub # define rb_gc_writebarrier_unprotect_promoted rb_gc_writebarrier_unprotect_promoted_stub
# endif #endif
#include <ruby.h> #include <ruby.h>
#ifdef RUBY19_OR_LATER #ifdef RUBY19_OR_LATER
@@ -422,7 +422,7 @@ VALUE rb_num2ulong(VALUE x)
# if defined(USE_RGENGC) && USE_RGENGC && !defined(PROTO) # if defined(USE_RGENGC) && USE_RGENGC && !defined(PROTO)
void rb_gc_writebarrier_unprotect_promoted_stub(VALUE obj) void rb_gc_writebarrier_unprotect_promoted_stub(VALUE obj)
{ {
return dll_rb_gc_writebarrier_unprotect_promoted(obj); dll_rb_gc_writebarrier_unprotect_promoted(obj);
} }
# endif # endif
@@ -763,7 +763,8 @@ static int ensure_ruby_initialized(void)
/* suggested by Ariya Mizutani */ /* suggested by Ariya Mizutani */
int argc = 1; int argc = 1;
char *argv[] = {"gvim.exe"}; char *argv[] = {"gvim.exe"};
NtInitialize(&argc, &argv); char **argvp = argv;
NtInitialize(&argc, &argvp);
#endif #endif
{ {
#if defined(RUBY19_OR_LATER) || defined(RUBY_INIT_STACK) #if defined(RUBY19_OR_LATER) || defined(RUBY_INIT_STACK)

2
src/version.c
View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
534,
/**/ /**/
533, 533,
/**/ /**/