mirror of
https://github.com/vim/vim.git
synced 2025-07-04 23:07:33 -04:00
patch 8.0.1351: warning for unused variables building with MinGW
Problem: Warning for unused variables building with MinGW. Solution: Change a few #ifdefs (suggested by John Marriott). Remove superfluous checks of FEAT_MBYTE.
This commit is contained in:
parent
1355aad2b9
commit
bdb8139098
@ -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 */
|
||||
|
@ -771,6 +771,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
1351,
|
||||
/**/
|
||||
1350,
|
||||
/**/
|
||||
|
Loading…
x
Reference in New Issue
Block a user