commit 0472b6d149445579e3a63519b15f099f9adda3f7
author Bram Moolenaar <Bram@vim.org> Mon Feb 18 21:41:37 2019 +0100
committer Bram Moolenaar <Bram@vim.org> Mon Feb 18 21:41:37 2019 +0100
tree eb18d68b92ec39e7ea27de818df4b6b68c23d59d
parent d53931ae7306acce2cfe8c44db0a15d79adf9e00

patch 8.1.0949: MS-windows defines GUI macros different than other systems

Problem:    MS-windows defines GUI macros different than other systems.
Solution:   Swap FEAT_GUI and FEAT_GUI_MSWIN. (Hirohito Higashi, closes #3996)

src/vim.rc

diff --git a/src/vim.rc b/src/vim.rc
index c3d3f5f..51c3b7b 100644
--- a/src/vim.rc
+++ b/src/vim.rc
@@ -23,7 +23,7 @@
 //
 IDR_VIM		ICON "vim.ico"
 
-#ifdef FEAT_GUI
+#ifdef FEAT_GUI_MSWIN
 IDR_VIM_ERROR	ICON "vim_error.ico"
 IDR_VIM_ALERT	ICON "vim_alert.ico"
 IDR_VIM_INFO	ICON "vim_info.ico"
@@ -46,7 +46,7 @@
 #endif
 
 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "gvim.exe.mnf"
-#endif // FEAT_GUI
+#endif // FEAT_GUI_MSWIN
 
 //
 // Type Library