summaryrefslogtreecommitdiff
path: root/src/proto.h
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-02-17 17:44:42 +0100
committerBram Moolenaar <Bram@vim.org>2019-02-17 17:44:42 +0100
commit4f97475d326c2773a78561fb874e4f23c25cbcd9 (patch)
tree7e066bc70556dfbb415ddb9f364e8432e8aaf189 /src/proto.h
parent78d21dae9c3a39efb30316d3e38dce120bc1abbd (diff)
downloadvim-git-4f97475d326c2773a78561fb874e4f23c25cbcd9.tar.gz
patch 8.1.0941: macros for MS-Windows are inconsistentv8.1.0941
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)
Diffstat (limited to 'src/proto.h')
-rw-r--r--src/proto.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/proto.h b/src/proto.h
index c19d15516..43192ffd5 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -38,7 +38,7 @@
# if defined(UNIX) || defined(VMS)
# include "os_unix.pro"
# endif
-# ifdef WIN3264
+# ifdef MSWIN
# include "os_win32.pro"
# include "os_mswin.pro"
# include "winclip.pro"
@@ -266,7 +266,7 @@ extern int putenv(const char *string); /* in misc2.c */
extern char_u *vimpty_getenv(const char_u *string); /* in misc2.c */
# endif
# endif
-# ifdef FEAT_GUI_W32
+# ifdef FEAT_GUI_MSWIN
# include "gui_w32.pro"
# endif
# ifdef FEAT_GUI_GTK