diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-02-17 17:44:42 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-02-17 17:44:42 +0100 |
| commit | 4f97475d326c2773a78561fb874e4f23c25cbcd9 (patch) | |
| tree | 7e066bc70556dfbb415ddb9f364e8432e8aaf189 /src/gui_beval.c | |
| parent | 78d21dae9c3a39efb30316d3e38dce120bc1abbd (diff) | |
| download | vim-git-4f97475d326c2773a78561fb874e4f23c25cbcd9.tar.gz | |
patch 8.1.0941: macros for MS-Windows are inconsistentv8.1.0941
Problem: Macros for MS-Windows are inconsistent, using "32", "3264 and
others.
Solution: Use MSWIN for all MS-Windows builds. Use FEAT_GUI_MSWIN for the
GUI build. (Hirohito Higashi, closes #3932)
Diffstat (limited to 'src/gui_beval.c')
| -rw-r--r-- | src/gui_beval.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui_beval.c b/src/gui_beval.c index 3a282181a..e1e093f37 100644 --- a/src/gui_beval.c +++ b/src/gui_beval.c @@ -13,7 +13,7 @@ #if defined(FEAT_BEVAL_GUI) || defined(PROTO) /* on Win32 only get_beval_info() is required */ -#if !defined(FEAT_GUI_W32) || defined(PROTO) +#if !defined(FEAT_GUI_MSWIN) || defined(PROTO) #ifdef FEAT_GUI_GTK # if GTK_CHECK_VERSION(3,0,0) @@ -197,10 +197,10 @@ gui_mch_currently_showing_beval(void) return current_beval; } #endif -#endif /* !FEAT_GUI_W32 */ +#endif /* !FEAT_GUI_MSWIN */ #if defined(FEAT_NETBEANS_INTG) || defined(FEAT_EVAL) || defined(PROTO) -# if !defined(FEAT_GUI_W32) || defined(PROTO) +# if !defined(FEAT_GUI_MSWIN) || defined(PROTO) /* * Show a balloon with "mesg". @@ -214,10 +214,10 @@ gui_mch_post_balloon(BalloonEval *beval, char_u *mesg) else undrawBalloon(beval); } -# endif /* !FEAT_GUI_W32 */ +# endif /* !FEAT_GUI_MSWIN */ #endif /* FEAT_NETBEANS_INTG || PROTO */ -#if !defined(FEAT_GUI_W32) || defined(PROTO) +#if !defined(FEAT_GUI_MSWIN) || defined(PROTO) #if defined(FEAT_BEVAL_TIP) || defined(PROTO) /* * Hide the given balloon. @@ -1220,6 +1220,6 @@ createBalloonEvalWindow(BalloonEval *beval) } #endif /* !FEAT_GUI_GTK */ -#endif /* !FEAT_GUI_W32 */ +#endif /* !FEAT_GUI_MSWIN */ #endif /* FEAT_BEVAL_GUI */ |