diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-11-27 17:44:08 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-11-27 17:44:08 +0100 |
| commit | 901407491382198e1457f3c315b2aedc1d24bda9 (patch) | |
| tree | 8d6913f602c395243c5653a41af9022531ea12dd /src/if_ruby.c | |
| parent | 0a383969378a328ffa363eee0d9a4c3d3c8257fe (diff) | |
| download | vim-git-901407491382198e1457f3c315b2aedc1d24bda9.tar.gz | |
updated for version 7.4.534v7.4.534
Problem: Warnings when compiling if_ruby.c.
Solution: Avoid the warnings. (Ken Takata)
Diffstat (limited to 'src/if_ruby.c')
| -rw-r--r-- | src/if_ruby.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/if_ruby.c b/src/if_ruby.c index 9301b7292..eb6141fbc 100644 --- a/src/if_ruby.c +++ b/src/if_ruby.c @@ -96,11 +96,11 @@ # define rb_num2int rb_num2int_stub #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 * rb_gc_writebarrier_unprotect_promoted if USE_RGENGC */ -# define rb_gc_writebarrier_unprotect_promoted rb_gc_writebarrier_unprotect_promoted_stub -# endif +# define rb_gc_writebarrier_unprotect_promoted rb_gc_writebarrier_unprotect_promoted_stub +#endif #include <ruby.h> #ifdef RUBY19_OR_LATER @@ -422,7 +422,7 @@ VALUE rb_num2ulong(VALUE x) # if defined(USE_RGENGC) && USE_RGENGC && !defined(PROTO) 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 @@ -763,7 +763,8 @@ static int ensure_ruby_initialized(void) /* suggested by Ariya Mizutani */ int argc = 1; char *argv[] = {"gvim.exe"}; - NtInitialize(&argc, &argv); + char **argvp = argv; + NtInitialize(&argc, &argvp); #endif { #if defined(RUBY19_OR_LATER) || defined(RUBY_INIT_STACK) |