aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/strings.c
diff options
context:
space:
mode:
authordundargoc <33953936+dundargoc@users.noreply.github.com>2022-09-18 03:17:15 +0200
committerGitHub <noreply@github.com>2022-09-18 09:17:15 +0800
commit6d557e324fd4223fff3279a0112f40431c540163 (patch)
tree74b9d80ccfe5bb6ac628a3455aa1f2c6c3b20497 /src/nvim/strings.c
parent3c3f3e7353ba2cb9071183cd05036ca2a98d3672 (diff)
downloadrneovim-6d557e324fd4223fff3279a0112f40431c540163.tar.gz
rneovim-6d557e324fd4223fff3279a0112f40431c540163.tar.bz2
rneovim-6d557e324fd4223fff3279a0112f40431c540163.zip
vim-patch:8.1.0941: macros for MS-Windows are inconsistent (#20215)
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 vim/vim#3932) https://github.com/vim/vim/commit/4f97475d326c2773a78561fb874e4f23c25cbcd9
Diffstat (limited to 'src/nvim/strings.c')
-rw-r--r--src/nvim/strings.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/strings.c b/src/nvim/strings.c
index b73221d4da..10173fac1d 100644
--- a/src/nvim/strings.c
+++ b/src/nvim/strings.c
@@ -186,7 +186,7 @@ char_u *vim_strsave_shellescape(const char_u *string, bool do_special, bool do_n
// First count the number of extra bytes required.
size_t length = STRLEN(string) + 3; // two quotes and a trailing NUL
for (const char_u *p = string; *p != NUL; MB_PTR_ADV(p)) {
-#ifdef WIN32
+#ifdef MSWIN
if (!p_ssl) {
if (*p == '"') {
length++; // " -> ""
@@ -217,7 +217,7 @@ char_u *vim_strsave_shellescape(const char_u *string, bool do_special, bool do_n
d = (char *)escaped_string;
// add opening quote
-#ifdef WIN32
+#ifdef MSWIN
if (!p_ssl) {
*d++ = '"';
} else
@@ -225,7 +225,7 @@ char_u *vim_strsave_shellescape(const char_u *string, bool do_special, bool do_n
*d++ = '\'';
for (const char *p = (char *)string; *p != NUL;) {
-#ifdef WIN32
+#ifdef MSWIN
if (!p_ssl) {
if (*p == '"') {
*d++ = '"';
@@ -269,7 +269,7 @@ char_u *vim_strsave_shellescape(const char_u *string, bool do_special, bool do_n
}
// add terminating quote and finish with a NUL
-#ifdef WIN32
+#ifdef MSWIN
if (!p_ssl) {
*d++ = '"';
} else