Mercurial > vim
changeset 15199:1e98b81ff9ee v8.1.0609
patch 8.1.0609: MS-Windows: unused variable, depending on the Ruby version
commit https://github.com/vim/vim/commit/9d5c84a08f0574e680ef61d7e44e981bd6be741d
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Dec 19 20:48:46 2018 +0100
patch 8.1.0609: MS-Windows: unused variable, depending on the Ruby version
Problem: MS-Windows: unused variable, depending on the Ruby version.
Solution: Put ruby_sysinit and NtInitialize inside #ifdef and make them
consistent. (Ken Takata)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Wed, 19 Dec 2018 21:00:06 +0100 |
parents | 2e45e601aa62 |
children | 23935ad47e52 |
files | src/if_ruby.c src/version.c |
diffstat | 2 files changed, 14 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/if_ruby.c +++ b/src/if_ruby.c @@ -326,8 +326,11 @@ static void ruby_vim_init(void); # define ruby_init dll_ruby_init # define ruby_init_loadpath dll_ruby_init_loadpath # ifdef WIN3264 -# define NtInitialize dll_NtInitialize -# define ruby_sysinit dll_ruby_sysinit +# ifdef RUBY19_OR_LATER +# define ruby_sysinit dll_ruby_sysinit +# else +# define NtInitialize dll_NtInitialize +# endif # if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18 # define rb_w32_snprintf dll_rb_w32_snprintf # endif @@ -437,8 +440,11 @@ static VALUE *dll_ruby_errinfo; static void (*dll_ruby_init) (void); static void (*dll_ruby_init_loadpath) (void); # ifdef WIN3264 +# ifdef RUBY19_OR_LATER +static void (*dll_ruby_sysinit) (int*, char***); +# else static void (*dll_NtInitialize) (int*, char***); -static void (*dll_ruby_sysinit) (int*, char***); +# endif # if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18 static int (*dll_rb_w32_snprintf)(char*, size_t, const char*, ...); # endif @@ -637,10 +643,10 @@ static struct {"ruby_init", (RUBY_PROC*)&dll_ruby_init}, {"ruby_init_loadpath", (RUBY_PROC*)&dll_ruby_init_loadpath}, # ifdef WIN3264 -# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER < 19 +# ifdef RUBY19_OR_LATER + {"ruby_sysinit", (RUBY_PROC*)&dll_ruby_sysinit}, +# else {"NtInitialize", (RUBY_PROC*)&dll_NtInitialize}, -# else - {"ruby_sysinit", (RUBY_PROC*)&dll_ruby_sysinit}, # endif # if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18 {"rb_w32_snprintf", (RUBY_PROC*)&dll_rb_w32_snprintf},