summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-02-17 12:30:17 +0100
committerBram Moolenaar <Bram@vim.org>2016-02-17 12:30:17 +0100
commit203219048fa007b5042d9b893fd647aef44722a0 (patch)
treeaf9337526c42b9ec4d90873f71d349b558868696
parentcd39bbcd1dd5bdc280f0fa5833b1107853f1227f (diff)
downloadvim-git-203219048fa007b5042d9b893fd647aef44722a0.tar.gz
patch 7.4.1344v7.4.1344
Problem: Can't compile Win32 GUI with tiny features. Solution: Add #ifdef. (Christian Brabandt)
-rw-r--r--src/gui_w32.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c
index 70dd9b593..cc31c7cee 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -1670,6 +1670,7 @@ gui_mch_init(void)
if (s_textArea == NULL)
return FAIL;
+#ifdef FEAT_LIBCALL
/* Try loading an icon from $RUNTIMEPATH/bitmaps/vim.ico. */
{
HANDLE hIcon = NULL;
@@ -1677,6 +1678,7 @@ gui_mch_init(void)
if (mch_icon_load(&hIcon) == OK && hIcon != NULL)
SendMessage(s_hwnd, WM_SETICON, ICON_SMALL, (LPARAM)hIcon);
}
+#endif
#ifdef FEAT_MENU
s_menuBar = CreateMenu();
diff --git a/src/version.c b/src/version.c
index 4f59a610f..ec88da4d0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1344,
+/**/
1343,
/**/
1342,