adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.1654: build failure when FEAT_DIFF is not defined

Browse Source 
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>
This commit is contained in:
Christian Brabandt
2025-08-20 20:37:37 +02:00
parent 2fd9ac7a69
commit e1a435c508
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/proto.h
View File

@ -73,9 +73,7 @@ extern int _stricoll(char *a, char *b);
# include "if_cscope.pro" # include "if_cscope.pro"
# include "debugger.pro" # include "debugger.pro"
# include "dict.pro" # include "dict.pro"
# ifdef FEAT_DIFF
# include "diff.pro" # include "diff.pro"
# endif
# include "linematch.pro" # include "linematch.pro"
# include "digraph.pro" # include "digraph.pro"
# include "drawline.pro" # include "drawline.pro"

3
src/structs.h
View File

@ -3671,6 +3671,9 @@ struct diffline_S
int bufidx; int bufidx;
int lineoff; int lineoff;
}; };
#else // FEAT_DIFF
typedef void diffline_T;
typedef void diffline_change_T;
#endif #endif
#define SNAP_HELP_IDX 0 #define SNAP_HELP_IDX 0

2
src/version.c
View File

@ -724,6 +724,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1654,
/**/ /**/
1653, 1653,
/**/ /**/