aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-28 04:24:06 -04:00
Code Activity

patch 8.1.0941: macros for MS-Windows are inconsistent

Browse Source 
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)
This commit is contained in:
Bram Moolenaar
2019-02-17 17:44:42 +01:00
parent 78d21dae9c
commit 4f97475d32
68 changed files with 537 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui_beval.c
View File

@@ -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 */