mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
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)
This commit is contained in:
@@ -326,8 +326,11 @@ static void ruby_vim_init(void);
|
|||||||
# define ruby_init dll_ruby_init
|
# define ruby_init dll_ruby_init
|
||||||
# define ruby_init_loadpath dll_ruby_init_loadpath
|
# define ruby_init_loadpath dll_ruby_init_loadpath
|
||||||
# ifdef WIN3264
|
# ifdef WIN3264
|
||||||
# define NtInitialize dll_NtInitialize
|
# ifdef RUBY19_OR_LATER
|
||||||
# define ruby_sysinit dll_ruby_sysinit
|
# define ruby_sysinit dll_ruby_sysinit
|
||||||
|
# else
|
||||||
|
# define NtInitialize dll_NtInitialize
|
||||||
|
# endif
|
||||||
# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
|
# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
|
||||||
# define rb_w32_snprintf dll_rb_w32_snprintf
|
# define rb_w32_snprintf dll_rb_w32_snprintf
|
||||||
# endif
|
# endif
|
||||||
@@ -437,8 +440,11 @@ static VALUE *dll_ruby_errinfo;
|
|||||||
static void (*dll_ruby_init) (void);
|
static void (*dll_ruby_init) (void);
|
||||||
static void (*dll_ruby_init_loadpath) (void);
|
static void (*dll_ruby_init_loadpath) (void);
|
||||||
# ifdef WIN3264
|
# ifdef WIN3264
|
||||||
static void (*dll_NtInitialize) (int*, char***);
|
# ifdef RUBY19_OR_LATER
|
||||||
static void (*dll_ruby_sysinit) (int*, char***);
|
static void (*dll_ruby_sysinit) (int*, char***);
|
||||||
|
# else
|
||||||
|
static void (*dll_NtInitialize) (int*, char***);
|
||||||
|
# endif
|
||||||
# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
|
# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
|
||||||
static int (*dll_rb_w32_snprintf)(char*, size_t, const char*, ...);
|
static int (*dll_rb_w32_snprintf)(char*, size_t, const char*, ...);
|
||||||
# endif
|
# endif
|
||||||
@@ -637,10 +643,10 @@ static struct
|
|||||||
{"ruby_init", (RUBY_PROC*)&dll_ruby_init},
|
{"ruby_init", (RUBY_PROC*)&dll_ruby_init},
|
||||||
{"ruby_init_loadpath", (RUBY_PROC*)&dll_ruby_init_loadpath},
|
{"ruby_init_loadpath", (RUBY_PROC*)&dll_ruby_init_loadpath},
|
||||||
# ifdef WIN3264
|
# ifdef WIN3264
|
||||||
# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER < 19
|
# ifdef RUBY19_OR_LATER
|
||||||
{"NtInitialize", (RUBY_PROC*)&dll_NtInitialize},
|
|
||||||
# else
|
|
||||||
{"ruby_sysinit", (RUBY_PROC*)&dll_ruby_sysinit},
|
{"ruby_sysinit", (RUBY_PROC*)&dll_ruby_sysinit},
|
||||||
|
# else
|
||||||
|
{"NtInitialize", (RUBY_PROC*)&dll_NtInitialize},
|
||||||
# endif
|
# endif
|
||||||
# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
|
# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
|
||||||
{"rb_w32_snprintf", (RUBY_PROC*)&dll_rb_w32_snprintf},
|
{"rb_w32_snprintf", (RUBY_PROC*)&dll_rb_w32_snprintf},
|
||||||
|
@@ -799,6 +799,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 */
|
||||||
|
/**/
|
||||||
|
609,
|
||||||
/**/
|
/**/
|
||||||
608,
|
608,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user