From 3b3a9a5609df2cbaef3512032ac47c1779fbc775 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 6 Mar 2018 16:11:47 +0100 Subject: patch 8.0.1581: cannot build Win32 GUI without +eval Problem: Cannot build Win32 GUI without +eval. Solution: Define HAVE_INPUT_METHOD without +eval. (Ken Takata) --- src/vim.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/vim.h') diff --git a/src/vim.h b/src/vim.h index 3cad06297..a30aa90e2 100644 --- a/src/vim.h +++ b/src/vim.h @@ -2119,15 +2119,21 @@ typedef enum { #endif # if defined(FEAT_MBYTE) && defined(FEAT_EVAL) \ - && ((!defined(FEAT_GUI_W32) \ + && (!defined(FEAT_GUI_W32) \ || !(defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))) \ - || (defined(MACOS_CONVERT) && !defined(FEAT_GUI_MAC))) -/* Whether IME is supported by im_get_status() defined in mbyte.c. */ + && !defined(FEAT_GUI_MAC) \ + && !defined(MACOS_CONVERT) +/* Whether IME is supported by im_get_status() defined in mbyte.c. + * For Win32 GUI it's in gui_w32.c when FEAT_MBYTE_IME or GLOBAL_IME is defined. + * for Mac it is in gui_mac.c for the GUI or in os_mac_conv.c when + * MACOS_CONVERT is defined. */ # define IME_WITHOUT_XIM #endif #if defined(FEAT_MBYTE) && (defined(FEAT_XIM) \ || defined(IME_WITHOUT_XIM) \ + || (defined(FEAT_GUI_W32) \ + && (defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))) \ || defined(FEAT_GUI_MAC)) /* im_set_active() is available */ # define HAVE_INPUT_METHOD -- cgit v1.2.1