diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-11-29 23:15:25 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-11-29 23:15:25 +0100 |
| commit | 310c32e8920140f0db747c6c6eb06b1ee53cdb5a (patch) | |
| tree | 6a63306e6627614a8f3b9b543f129323f3093f86 /src/mbyte.c | |
| parent | 15a7bdcb77faabbd3a9a889957f810da2bcda13e (diff) | |
patch 8.1.2361: MS-Windows: test failures related to VIMDLLv8.1.2361
Problem: MS-Windows: test failures related to VIMDLL.
Solution: Adjust code and tests. (Ken Takata, closes #5283)
Diffstat (limited to 'src/mbyte.c')
| -rw-r--r-- | src/mbyte.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/mbyte.c b/src/mbyte.c index 6ecf53bc09..4dfcfc952b 100644 --- a/src/mbyte.c +++ b/src/mbyte.c @@ -4789,7 +4789,8 @@ iconv_end(void) # define USE_IMSTATUSFUNC (*p_imsf != NUL) #endif -#if defined(FEAT_EVAL) && (defined(FEAT_XIM) || defined(IME_WITHOUT_XIM)) +#if defined(FEAT_EVAL) && \ + (defined(FEAT_XIM) || defined(IME_WITHOUT_XIM) || defined(VIMDLL)) static void call_imactivatefunc(int active) { @@ -6454,11 +6455,15 @@ xim_get_status_area_height(void) #else /* !defined(FEAT_XIM) */ -# ifdef IME_WITHOUT_XIM +# if defined(IME_WITHOUT_XIM) || defined(VIMDLL) static int im_was_set_active = FALSE; int +# ifdef VIMDLL +mbyte_im_get_status(void) +# else im_get_status(void) +# endif { # if defined(FEAT_EVAL) if (USE_IMSTATUSFUNC) @@ -6468,7 +6473,11 @@ im_get_status(void) } void +# ifdef VIMDLL +mbyte_im_set_active(int active_arg) +# else im_set_active(int active_arg) +# endif { # if defined(FEAT_EVAL) int active = !p_imdisable && active_arg; @@ -6481,7 +6490,7 @@ im_set_active(int active_arg) # endif } -# ifdef FEAT_GUI +# if defined(FEAT_GUI) && !defined(VIMDLL) void im_set_position(int row UNUSED, int col UNUSED) { |