From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 13 Sep 2019 20:03:19 +0000 (+0200)
Subject: patch 8.1.2025: MS-Windows: Including shlguid.h causes problems for msys2
X-Git-Tag: v8.1.2025
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1946de140a84accaa2f298c7fdccc1be37b9f630;p=vim

patch 8.1.2025: MS-Windows: Including shlguid.h causes problems for msys2

Problem:    MS-Windows: Including shlguid.h causes problems for msys2.
Solution:   Do not include shlguid.h. (closes #4913)
---

diff --git a/src/GvimExt/gvimext.h b/src/GvimExt/gvimext.h
index 7a4e009fd..e43e75fdd 100644
--- a/src/GvimExt/gvimext.h
+++ b/src/GvimExt/gvimext.h
@@ -57,7 +57,6 @@
 #pragma data_seg(".text")
 #define INITGUID
 #include <initguid.h>
-#include <shlguid.h>
 
 //
 // The class ID of this Shell extension class.
diff --git a/src/version.c b/src/version.c
index 6dddcfb45..f412732ca 100644
--- a/src/version.c
+++ b/src/version.c
@@ -757,6 +757,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2025,
 /**/
     2024,
 /**/