diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-11-27 23:24:08 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-11-27 23:24:08 +0100 |
| commit | bdb8139098d170ede2bc79dd4f62e4ed5e778d3e (patch) | |
| tree | b09f3c7177f9841bc568ef3e194cb1b4e7bd2953 | |
| parent | 1355aad2b94790217aeef9077d3fb9925461f137 (diff) | |
| download | vim-git-bdb8139098d170ede2bc79dd4f62e4ed5e778d3e.tar.gz | |
patch 8.0.1351: warning for unused variables building with MinGWv8.0.1351
Problem: Warning for unused variables building with MinGW.
Solution: Change a few #ifdefs (suggested by John Marriott). Remove
superfluous checks of FEAT_MBYTE.
| -rw-r--r-- | src/gui_w32.c | 20 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 14 insertions, 8 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c index 7610b18fd..521279ead 100644 --- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -498,9 +498,11 @@ static void TrackUserActivity(UINT uMsg); * * These LOGFONT used for IME. */ -#ifdef FEAT_MBYTE +#if defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME) /* holds LOGFONT for 'guifontwide' if available, otherwise 'guifont' */ static LOGFONT norm_logfont; +#endif +#ifdef FEAT_MBYTE_IME /* holds LOGFONT for 'guifont' always. */ static LOGFONT sub_logfont; #endif @@ -3361,6 +3363,8 @@ gui_mch_init_font(char_u *font_name, int fontset UNUSED) font_name = (char_u *)lf.lfFaceName; #if defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME) norm_logfont = lf; +#endif +#ifdef FEAT_MBYTE_IME sub_logfont = lf; #endif #ifdef FEAT_MBYTE_IME @@ -5794,15 +5798,15 @@ gui_mch_set_sp_color(guicolor_T color) gui.currSpColor = color; } -#if defined(FEAT_MBYTE) && defined(FEAT_MBYTE_IME) +#ifdef FEAT_MBYTE_IME /* * Multi-byte handling, originally by Sung-Hoon Baek. * First static functions (no prototypes generated). */ -#ifdef _MSC_VER -# include <ime.h> /* Apparently not needed for Cygwin, MingW or Borland. */ -#endif -#include <imm.h> +# ifdef _MSC_VER +# include <ime.h> /* Apparently not needed for Cygwin, MingW or Borland. */ +# endif +# include <imm.h> /* * handle WM_IME_NOTIFY message @@ -5954,7 +5958,7 @@ GetResultStr(HWND hwnd, int GCS, int *lenp) #endif /* For global functions we need prototypes. */ -#if (defined(FEAT_MBYTE) && defined(FEAT_MBYTE_IME)) || defined(PROTO) +#if defined(FEAT_MBYTE_IME) || defined(PROTO) /* * set font to IM. @@ -6079,7 +6083,7 @@ im_get_status(void) return status; } -#endif /* FEAT_MBYTE && FEAT_MBYTE_IME */ +#endif /* FEAT_MBYTE_IME */ #if defined(FEAT_MBYTE) && !defined(FEAT_MBYTE_IME) && defined(GLOBAL_IME) /* Win32 with GLOBAL IME */ diff --git a/src/version.c b/src/version.c index 066294a50..14e5083f9 100644 --- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1351, +/**/ 1350, /**/ 1349, |