]> git.ipfire.org Git - thirdparty/vim.git/commitdiff
patch 7.4.1344 v7.4.1344
authorBram Moolenaar <Bram@vim.org>
Wed, 17 Feb 2016 11:30:17 +0000 (12:30 +0100)
committerBram Moolenaar <Bram@vim.org>
Wed, 17 Feb 2016 11:30:17 +0000 (12:30 +0100)
Problem:    Can't compile Win32 GUI with tiny features.
Solution:   Add #ifdef. (Christian Brabandt)

src/gui_w32.c
src/version.c

index 70dd9b593e406b58bb1fdc83e28de0730ca8d0ab..cc31c7cee2d370fd3a44645853dad7892d6d7cda 100644 (file)
@@ -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();
index 4f59a610f70b65d7610902e736b0e16fb11797a2..ec88da4d0e1324acd4d46e2746f2966dfb57069d 100644 (file)
@@ -747,6 +747,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1344,
 /**/
     1343,
 /**/