thac0/vim
1
0
Fork 0
forked from aniani/vim
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

18
src/version.c
View File

@@ -222,7 +222,7 @@ static char *(features[]) =
#else
"-digraphs",
#endif
#ifdef FEAT_GUI_W32
#ifdef FEAT_GUI_MSWIN
# ifdef FEAT_DIRECTX
"+directx",
# else
@@ -481,7 +481,7 @@ static char *(features[]) =
#else
"-num64",
#endif
#ifdef FEAT_GUI_W32
#ifdef FEAT_GUI_MSWIN
# ifdef FEAT_OLE
"+ole",
# else
@@ -700,7 +700,7 @@ static char *(features[]) =
"-viminfo",
#endif
"+vreplace",
#ifdef WIN3264
#ifdef MSWIN
# ifdef FEAT_VTP
"+vtp",
# else
@@ -740,7 +740,7 @@ static char *(features[]) =
#else
"-xim",
#endif
#ifdef WIN3264
#ifdef MSWIN
# ifdef FEAT_XPM_W32
"+xpm_w32",
# else
@@ -779,6 +779,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
941,
/**/
940,
/**/
@@ -2852,16 +2854,16 @@ list_version(void)
*/
init_longVersion();
msg(longVersion);
#ifdef WIN3264
# ifdef FEAT_GUI_W32
#ifdef MSWIN
# ifdef FEAT_GUI_MSWIN
# ifdef _WIN64
msg_puts(_("\nMS-Windows 64-bit GUI version"));
# else
msg_puts(_("\nMS-Windows 32-bit GUI version"));
# endif
# ifdef FEAT_OLE
# ifdef FEAT_OLE
msg_puts(_(" with OLE support"));
# endif
# endif
# else
# ifdef _WIN64
msg_puts(_("\nMS-Windows 64-bit console version"));