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 <cb@256bit.org>

diff --git a/src/proto.h b/src/proto.h
index 3c34fe8132cf5b6d21651aba8509a6c525afbd1c..e9e5efcbc5431c8d5499a9a93dda0cd7d7dd3310 100644 (file)
--- 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 d7b458077478587bfb34a6c263b380f9cc15e31e..0968b3c9a9e6a15365fc42d07c9973859fbc3dbe 100644 (file)
--- 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 359790bfd161fee8c8fbafbe02eb664d65273b9b..0d7d245c099f2749a41cae7898ac0b053604b412 100644 (file)
--- 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,
 /**/