diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-09-13 22:03:19 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-09-13 22:03:19 +0200 |
| commit | 1946de140a84accaa2f298c7fdccc1be37b9f630 (patch) | |
| tree | c1023d2ac2242177e767c98350bec439c2bef3ae /src | |
| parent | 9283f92008accd0b797d2c913ce191b490ce3c3d (diff) | |
patch 8.1.2025: MS-Windows: Including shlguid.h causes problems for msys2v8.1.2025
Problem: MS-Windows: Including shlguid.h causes problems for msys2.
Solution: Do not include shlguid.h. (closes #4913)
Diffstat (limited to 'src')
| -rw-r--r-- | src/GvimExt/gvimext.h | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/GvimExt/gvimext.h b/src/GvimExt/gvimext.h index 7a4e009fdb..e43e75fdd7 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 6dddcfb45a..f412732ca4 100644 --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2025, +/**/ 2024, /**/ 2023, |