patch 9.1.1658: Missing includes for Wayland headers
Commit:
https://github.com/vim/vim/commit/bb26f709ea6e31b69d693cb754e901f23f5d1296
Author: Christoffer Aasted <[email protected]>
Date: Wed Aug 20 21:21:57 2025 +0200
patch 9.1.1658: Missing includes for Wayland headers
Problem: Missing includes for Wayland headers, when subfolder is used
(after v9.1.1644)
Solution: Add new $WAYLAND_CPPFLAGS (Christoffer Aasted).
closes: #18051
Signed-off-by: Christoffer Aasted <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/src/Makefile b/src/Makefile
index 32c0d97d1..d1b08be25 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3658,19 +3658,19 @@ objects/window.o: window.c
$(CCC) -o $@ window.c
objects/wayland.o: wayland.c
- $(CCC) $(WAYLAND_CFLAGS) -o $@ wayland.c
+ $(CCC) $(WAYLAND_CFLAGS) $(WAYLAND_CPPFLAGS) -o $@ wayland.c
objects/wlr-data-control-unstable-v1.o:
auto/wayland/wlr-data-control-unstable-v1.c
- $(CCC) $(WAYLAND_CFLAGS) -o $@
auto/wayland/wlr-data-control-unstable-v1.c
+ $(CCC) $(WAYLAND_CFLAGS) $(WAYLAND_CPPFLAGS) -o $@
auto/wayland/wlr-data-control-unstable-v1.c
objects/ext-data-control-v1.o: auto/wayland/ext-data-control-v1.c
- $(CCC) $(WAYLAND_CFLAGS) -o $@ auto/wayland/ext-data-control-v1.c
+ $(CCC) $(WAYLAND_CFLAGS) $(WAYLAND_CPPFLAGS) -o $@
auto/wayland/ext-data-control-v1.c
objects/xdg-shell.o: auto/wayland/xdg-shell.c
- $(CCC) $(WAYLAND_CFLAGS) -o $@ auto/wayland/xdg-shell.c
+ $(CCC) $(WAYLAND_CFLAGS) $(WAYLAND_CPPFLAGS) -o $@
auto/wayland/xdg-shell.c
objects/primary-selection-unstable-v1.o:
auto/wayland/primary-selection-unstable-v1.c
- $(CCC) $(WAYLAND_CFLAGS) -o $@
auto/wayland/primary-selection-unstable-v1.c
+ $(CCC) $(WAYLAND_CFLAGS) $(WAYLAND_CPPFLAGS) -o $@
auto/wayland/primary-selection-unstable-v1.c
objects/netbeans.o: netbeans.c
$(CCC) -o $@ netbeans.c
diff --git a/src/config.mk.in b/src/config.mk.in
index 78b207ef7..a46a140a7 100644
--- a/src/config.mk.in
+++ b/src/config.mk.in
@@ -37,10 +37,11 @@ X_PRE_LIBS = @X_PRE_LIBS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIB@
-WAYLAND_LIBS = @WAYLAND_LIBS@
-WAYLAND_SRC = @WAYLAND_SRC@
-WAYLAND_OBJ = @WAYLAND_OBJ@
-WAYLAND_CFLAGS = @WAYLAND_CFLAGS@
+WAYLAND_LIBS = @WAYLAND_LIBS@
+WAYLAND_SRC = @WAYLAND_SRC@
+WAYLAND_OBJ = @WAYLAND_OBJ@
+WAYLAND_CFLAGS = @WAYLAND_CFLAGS@
+WAYLAND_CPPFLAGS = @WAYLAND_CPPFLAGS@
XDIFF_OBJS_USED = @XDIFF_OBJS_USED@
diff --git a/src/version.c b/src/version.c
index 2a4cd7515..4d2aa59cc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -724,6 +724,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1658,
/**/
1657,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1uooVZ-009RQL-Oe%40256bit.org.
