Commit: patch 9.2.0393: MS-Windows: link error with XPM support on UCRT64

3 views
Skip to first unread message

Christian Brabandt

unread,
Apr 26, 2026, 4:15:22 AMApr 26
to vim...@googlegroups.com
patch 9.2.0393: MS-Windows: link error with XPM support on UCRT64

Commit: https://github.com/vim/vim/commit/0c2ac3480a76b46ab63852c417255506f7c22117
Author: Yasuhiro Matsumoto <matt...@gmail.com>
Date: Sun Apr 26 07:57:14 2026 +0000

patch 9.2.0393: MS-Windows: link error with XPM support on UCRT64

Problem: MS-Windows: link error with XPM support on UCRT64
Solution: Make_cyg_ming.mak: allow XPM to point to system layout with
X11/ headers (Yasuhiro Matsumoto)

When XPM is set to a system prefix such as /msys64/ucrt64 (where xpm.h
lives in include/X11/), the existing -I flags miss the header. Add
-I $(XPM)/include/X11 so both the bundled layout (xpm/include/xpm.h)
and the system layout (include/X11/xpm.h) work.

closes: #20064

Signed-off-by: Yasuhiro Matsumoto <matt...@gmail.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 0cb83ac48..f5b86eeb4 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -744,7 +744,7 @@ XPM = no
endif
ifdef XPM
ifneq ($(XPM),no)
-CFLAGS += -DFEAT_XPM_W32 -I $(XPM)/include -I $(XPM)/../include
+CFLAGS += -DFEAT_XPM_W32 -I $(XPM)/include -I $(XPM)/include/X11 -I $(XPM)/../include
endif
endif

diff --git a/src/version.c b/src/version.c
index 8d6be2e96..d4b5c5100 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 393,
/**/
392,
/**/
Reply all
Reply to author
Forward
0 new messages