Mercurial > vim

diff src/misc2.c @ 15868:7fad90423bd2 v8.1.0941

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 99ebf78686a9
children 012f03e583e2
line wrap: on
line diff
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -1427,7 +1427,7 @@ vim_strsave_shellescape(char_u *string, 
     length = (unsigned)STRLEN(string) + 3;  /* two quotes and a trailing NUL */
     for (p = string; *p != NUL; MB_PTR_ADV(p))
     {
-# ifdef WIN32
+# ifdef MSWIN
 	if (!p_ssl)
 	{
 	    if (*p == '"')
@@ -1458,7 +1458,7 @@ vim_strsave_shellescape(char_u *string, 
 	d = escaped_string;
 
 	/* add opening quote */
-# ifdef WIN32
+# ifdef MSWIN
 	if (!p_ssl)
 	    *d++ = '"';
 	else
@@ -1467,7 +1467,7 @@ vim_strsave_shellescape(char_u *string, 
 
 	for (p = string; *p != NUL; )
 	{
-# ifdef WIN32
+# ifdef MSWIN
 	    if (!p_ssl)
 	    {
 		if (*p == '"')
@@ -1510,7 +1510,7 @@ vim_strsave_shellescape(char_u *string, 
 	}
 
 	/* add terminating quote and finish with a NUL */
-# ifdef WIN32
+# ifdef MSWIN
 	if (!p_ssl)
 	    *d++ = '"';
 	else
@@ -2169,7 +2169,7 @@ ga_append(garray_T *gap, int c)
     }
 }
 
-#if (defined(UNIX) && !defined(USE_SYSTEM)) || defined(WIN3264) \
+#if (defined(UNIX) && !defined(USE_SYSTEM)) || defined(MSWIN) \
 	|| defined(PROTO)
 /*
  * Append the text in "gap" below the cursor line and clear "gap".
@@ -4185,7 +4185,7 @@ filewritable(char_u *fname)
     perm = mch_getperm(fname);
 #endif
     if (
-# ifdef WIN3264
+# ifdef MSWIN
 	    mch_writable(fname) &&
 # else
 # if defined(UNIX) || defined(VMS)
@@ -4437,7 +4437,7 @@ parse_queued_messages(void)
     for (i = 0; i < MAX_REPEAT_PARSE; ++i)
     {
 	// For Win32 mch_breakcheck() does not check for input, do it here.
-# if defined(WIN32) && defined(FEAT_JOB_CHANNEL)
+# if defined(MSWIN) && defined(FEAT_JOB_CHANNEL)
 	channel_handle_events(FALSE);
 # endif