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 7a4e009fdbec8a9260f8f394c96711e9b7b07a03..e43e75fdd786d69e8b0e3c31cde372239bf59395 100644 (file)
--- 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 6dddcfb45a8523bc27a7a3b40ad9d316cc9f3389..f412732ca4feda94af606df7992c491d8da89a1e 100644 (file)
--- 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,
 /**/