Mercurial > vim
diff src/version.c @ 15868:7fad90423bd2 v8.1.0941
patch 8.1.0941: macros for MS-Windows are inconsistent
commit https://github.com/vim/vim/commit/4f97475d326c2773a78561fb874e4f23c25cbcd9
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Feb 17 17:44:42 2019 +0100
patch 8.1.0941: macros for MS-Windows are inconsistent
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)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 17 Feb 2019 17:45:08 +0100 |
| parents | 6ddcd10aa7af |
| children | df0426d67bb3 |
line wrap: on
line diff
--- a/src/version.c +++ b/src/version.c @@ -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 @@ -780,6 +780,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 941, +/**/ 940, /**/ 939, @@ -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"));