Mercurial > vim
diff src/ex_docmd.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 | 393a9a3a2da2 |
line wrap: on
line diff
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -177,7 +177,7 @@ static void ex_edit(exarg_T *eap); # define ex_gui ex_nogui static void ex_nogui(exarg_T *eap); #endif -#if defined(FEAT_GUI_W32) && defined(FEAT_MENU) && defined(FEAT_TEAROFF) +#if defined(FEAT_GUI_MSWIN) && defined(FEAT_MENU) && defined(FEAT_TEAROFF) static void ex_tearoff(exarg_T *eap); #else # define ex_tearoff ex_ni @@ -8866,7 +8866,7 @@ ex_nogui(exarg_T *eap) } #endif -#if defined(FEAT_GUI_W32) && defined(FEAT_MENU) && defined(FEAT_TEAROFF) +#if defined(FEAT_GUI_MSWIN) && defined(FEAT_MENU) && defined(FEAT_TEAROFF) static void ex_tearoff(exarg_T *eap) { @@ -9853,7 +9853,7 @@ ex_redraw(exarg_T *eap) if (need_maketitle) maketitle(); #endif -#if defined(WIN3264) && !defined(FEAT_GUI_W32) +#if defined(MSWIN) && !defined(FEAT_GUI_MSWIN) resize_console_buf(); #endif RedrawingDisabled = r;