Commit: patch 9.1.1654: build failure when FEAT_DIFF is not defined

3 views
Skip to first unread message

Christian Brabandt

unread,
Aug 20, 2025, 2:45:16 PM8/20/25
to vim...@googlegroups.com
patch 9.1.1654: build failure when FEAT_DIFF is not defined

Commit: https://github.com/vim/vim/commit/e1a435c508fe66bd05aa7e745d8f5240704025dd
Author: Christian Brabandt <c...@256bit.org>
Date: Wed Aug 20 20:37:37 2025 +0200

patch 9.1.1654: build failure when FEAT_DIFF is not defined

Problem: build failure when FEAT_DIFF is not defined
(John Marriott)
Solution: Remove FEAT_DIFF in proto.h; define dummy type for
diffline_T and diffline_change_T when FEAT_DIFF is not defined

related: #18026
closes: #18046

Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/src/proto.h b/src/proto.h
index 3c34fe813..e9e5efcbc 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -73,9 +73,7 @@ extern int _stricoll(char *a, char *b);
# include "if_cscope.pro"
# include "debugger.pro"
# include "dict.pro"
-# ifdef FEAT_DIFF
# include "diff.pro"
-# endif
# include "linematch.pro"
# include "digraph.pro"
# include "drawline.pro"
diff --git a/src/structs.h b/src/structs.h
index d7b458077..0968b3c9a 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -3671,6 +3671,9 @@ struct diffline_S
int bufidx;
int lineoff;
};
+#else // FEAT_DIFF
+typedef void diffline_T;
+typedef void diffline_change_T;
#endif

#define SNAP_HELP_IDX 0
diff --git a/src/version.c b/src/version.c
index 359790bfd..0d7d245c0 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 */
+/**/
+ 1654,
/**/
1653,
/**/
Reply all
Reply to author
Forward
0 new messages