Mercurial > vim
changeset 6406:ee28ddfc7b7c v7.4.534
updated for version 7.4.534
Problem: Warnings when compiling if_ruby.c.
Solution: Avoid the warnings. (Ken Takata)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Thu, 27 Nov 2014 17:44:08 +0100 |
| parents | 2ef0ff943f0f |
| children | 6e6769434873 |
| files | src/if_ruby.c src/version.c |
| diffstat | 2 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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)