Mercurial > vim
diff src/ex_cmds.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 | a6ca8cf07a98 |
| children | f581167d59bf |
line wrap: on
line diff
--- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -1618,7 +1618,7 @@ do_shell( */ #ifndef FEAT_GUI_MSWIN if (cmd == NULL -# ifdef WIN3264 +# ifdef MSWIN || (winstart && !need_wait_return) # endif ) @@ -1643,7 +1643,7 @@ do_shell( # endif no_wait_return = save_nwr; } -#endif /* FEAT_GUI_W32 */ +#endif /* FEAT_GUI_MSWIN */ #ifdef MSWIN if (!winstart) /* if winstart==TRUE, never stopped termcap! */ @@ -1935,7 +1935,7 @@ write_viminfo(char_u *file, int forceit) int shortname = FALSE; /* use 8.3 file name */ stat_T st_old; /* mch_stat() of existing viminfo file */ #endif -#ifdef WIN3264 +#ifdef MSWIN int hidden = FALSE; #endif @@ -1999,7 +1999,7 @@ write_viminfo(char_u *file, int forceit) goto end; } #endif -#ifdef WIN3264 +#ifdef MSWIN /* Get the file attributes of the existing viminfo file. */ hidden = mch_ishidden(fname); #endif @@ -2195,7 +2195,7 @@ write_viminfo(char_u *file, int forceit) ++viminfo_errcnt; semsg(_("E886: Can't rename viminfo file to %s!"), fname); } -# ifdef WIN3264 +# ifdef MSWIN /* If the viminfo file was hidden then also hide the new file. */ else if (hidden) mch_hide(fname);